Merge remote-tracking branch 'upstream/master' into fixJavaDocErr
diff --git a/connectors/src/main/java/quarks/samples/connectors/MsgSupplier.java b/connectors/src/main/java/quarks/samples/connectors/MsgSupplier.java
index e4e3ec1..13beb11 100644
--- a/connectors/src/main/java/quarks/samples/connectors/MsgSupplier.java
+++ b/connectors/src/main/java/quarks/samples/connectors/MsgSupplier.java
@@ -21,7 +21,7 @@
import quarks.function.Supplier;
/**
- * A Supplier<String> for creating sample messages to publish.
+ * A Supplier<String> for creating sample messages to publish.
*/
public class MsgSupplier implements Supplier<String> {
private static final long serialVersionUID = 1L;
diff --git a/connectors/src/main/java/quarks/samples/connectors/elm327/runtime/CommandExecutor.java b/connectors/src/main/java/quarks/samples/connectors/elm327/runtime/CommandExecutor.java
index f390b0c..39fa65b 100644
--- a/connectors/src/main/java/quarks/samples/connectors/elm327/runtime/CommandExecutor.java
+++ b/connectors/src/main/java/quarks/samples/connectors/elm327/runtime/CommandExecutor.java
@@ -29,7 +29,7 @@
import quarks.samples.connectors.elm327.Elm327Cmds;
/**
- * Runtime execution of ELM327 & OBD-II commands.
+ * Runtime execution of ELM327 & OBD-II commands.
*
*/
public class CommandExecutor {
diff --git a/connectors/src/main/java/quarks/samples/connectors/file/FileWriterApp.java b/connectors/src/main/java/quarks/samples/connectors/file/FileWriterApp.java
index 8987fbd..ae61398 100644
--- a/connectors/src/main/java/quarks/samples/connectors/file/FileWriterApp.java
+++ b/connectors/src/main/java/quarks/samples/connectors/file/FileWriterApp.java
@@ -34,7 +34,7 @@
import quarks.topology.Topology;
/**
- * Write a TStream<String> to files.
+ * Write a TStream<String> to files.
*/
public class FileWriterApp {
private final String directory;
diff --git a/connectors/src/main/java/quarks/samples/connectors/file/package-info.java b/connectors/src/main/java/quarks/samples/connectors/file/package-info.java
index f4b971f..67b1585 100644
--- a/connectors/src/main/java/quarks/samples/connectors/file/package-info.java
+++ b/connectors/src/main/java/quarks/samples/connectors/file/package-info.java
@@ -21,7 +21,7 @@
* <a href="{@docRoot}/quarks/connectors/file/package-summary.html">
* File stream connector</a>.
* <p>
- * See <quarks-release>/scripts/connectors/file/README to run the samples.
+ * See <quarks-release>/scripts/connectors/file/README to run the samples.
* <p>
* The following samples are provided:
* <ul>
diff --git a/connectors/src/main/java/quarks/samples/connectors/jdbc/package-info.java b/connectors/src/main/java/quarks/samples/connectors/jdbc/package-info.java
index 34ec998..f232307 100644
--- a/connectors/src/main/java/quarks/samples/connectors/jdbc/package-info.java
+++ b/connectors/src/main/java/quarks/samples/connectors/jdbc/package-info.java
@@ -21,7 +21,7 @@
* <a href="{@docRoot}/quarks/connectors/jdbc/package-summary.html">
* JDBC stream connector</a>.
* <p>
- * See <quarks-release>/scripts/connectors/jdbc/README to run the samples.
+ * See <quarks-release>/scripts/connectors/jdbc/README to run the samples.
* <p>
* The following samples are provided:
* <ul>
diff --git a/connectors/src/main/java/quarks/samples/connectors/kafka/KafkaClient.java b/connectors/src/main/java/quarks/samples/connectors/kafka/KafkaClient.java
index 8fd61b7..514ffe0 100644
--- a/connectors/src/main/java/quarks/samples/connectors/kafka/KafkaClient.java
+++ b/connectors/src/main/java/quarks/samples/connectors/kafka/KafkaClient.java
@@ -54,6 +54,7 @@
* } - Run directly from the command line.
* </LI>
* </UL>
+ * <UL>
* <LI>
* An application execution within your IDE once you set the class path to include the correct jars.</LI>
* </UL>
diff --git a/connectors/src/main/java/quarks/samples/connectors/kafka/package-info.java b/connectors/src/main/java/quarks/samples/connectors/kafka/package-info.java
index 45c5ea6..7f2cb9e 100644
--- a/connectors/src/main/java/quarks/samples/connectors/kafka/package-info.java
+++ b/connectors/src/main/java/quarks/samples/connectors/kafka/package-info.java
@@ -22,7 +22,7 @@
* <a href="{@docRoot}/quarks/connectors/kafka/package-summary.html">
* Apache Kafka stream connector</a>.
* <p>
- * See <quarks-release>/scripts/connectors/kafka/README to run the samples.
+ * See <quarks-release>/scripts/connectors/kafka/README to run the samples.
* <p>
* The following simple samples are provided:
* <ul>
diff --git a/connectors/src/main/java/quarks/samples/connectors/mqtt/MqttClient.java b/connectors/src/main/java/quarks/samples/connectors/mqtt/MqttClient.java
index a9944bd..9b72f17 100644
--- a/connectors/src/main/java/quarks/samples/connectors/mqtt/MqttClient.java
+++ b/connectors/src/main/java/quarks/samples/connectors/mqtt/MqttClient.java
@@ -47,11 +47,13 @@
* quarks.samples.connectors.mqtt.MqttClient -h
* } - Run directly from the command line.
* </LI>
+ * <LI>
* Specify absolute pathnames if using the {@code trustStore}
* or {@code keyStore} arguments.
- * </UL>
+ * </LI>
* <LI>
- * An application execution within your IDE once you set the class path to include the correct jars.</LI>
+ * An application execution within your IDE once you set the class path to include the correct jars.
+ * </LI>
* </UL>
*/
public class MqttClient {
diff --git a/connectors/src/main/java/quarks/samples/connectors/mqtt/package-info.java b/connectors/src/main/java/quarks/samples/connectors/mqtt/package-info.java
index 0b40474..72e5943 100644
--- a/connectors/src/main/java/quarks/samples/connectors/mqtt/package-info.java
+++ b/connectors/src/main/java/quarks/samples/connectors/mqtt/package-info.java
@@ -22,7 +22,7 @@
* <a href="{@docRoot}/quarks/connectors/mqtt/package-summary.html">
* MQTT stream connector</a>.
* <p>
- * See <quarks-release>/scripts/connectors/mqtt/README to run the samples.
+ * See <quarks-release>/scripts/connectors/mqtt/README to run the samples.
* <p>
* The following simple samples are provided:
* <ul>
diff --git a/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java b/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
index b40ccb1..788f829 100644
--- a/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
+++ b/console/src/main/java/quarks/samples/console/ConsoleWaterDetector.java
@@ -37,7 +37,6 @@
import quarks.providers.development.DevelopmentProvider;
import quarks.providers.direct.DirectProvider;
-
import quarks.topology.TStream;
import quarks.topology.Topology;
@@ -54,14 +53,17 @@
* </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.
+ * allows the user to identify elements of the view.
+ * </P>
* <P> The "Static flow" view shows the toology in an unchanging state - that is if tuple counts are available the
* lines (connections) representing the edges of the topology are not updated, nor are the circles (representing the vertices) dimensions updated.
- * The purpose of this view is to give the user an indication of the topology map of the application.
+ * The purpose of this view is to give the user an indication of the topology map of the application.
+ * </P>
* <P>
* The "Oplet kind" view colors the oplets or vertices displayed in the topology graph (the circles) by their
* corresponding Oplet kind.
* </P>
+ * <P>
* If "Tuple count" is selected the legend reflects ranges of tuple counts measured since the application was started.
* </P>
* <P>
@@ -75,7 +77,7 @@
* are available since the DevelopmentProvider class is being used. Note that the DevelopmentProvider class adds a Metrics counter
* to all oplets in the topology, with the exception of certain oplet types. For further information
* about how metrics are added to a topology, see the details in the quarks.metrics.Metrics class and the counter method.
- * <br/>
+ * <br>
* A counter can be added to an individual oplet, and not the entire topology. For an example of this
* see the quarks.samples.utils.metrics.DevelopmentMetricsSample.
* </P>
@@ -233,7 +235,7 @@
}
/**
- * Creates a TStream<JsonObject> for each sensor reading for each well. Unions all the TStream<JsonObject> into a
+ * Creates a TStream<JsonObject> for each sensor reading for each well. Unions all the TStream<JsonObject> into a
* single one representing all readings on the well.
* @param topology Topology providing the tuples for the sensors
* @param wellId Id of the well sending the measurements
