You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by jf...@apache.org on 2019/03/07 16:28:30 UTC
[incubator-edgent] branch one-module-for-api created (now 731e2c2)
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a change to branch one-module-for-api
in repository https://gitbox.apache.org/repos/asf/incubator-edgent.git.
at 731e2c2 Centralisation of all api submodules.
This branch includes the following new commits:
new 731e2c2 Centralisation of all api submodules.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-edgent] 01/01: Centralisation of all api submodules.
Posted by jf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch one-module-for-api
in repository https://gitbox.apache.org/repos/asf/incubator-edgent.git
commit 731e2c2dbe2af874edd989399ac48d9c08f2f8aa
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Thu Mar 7 16:22:24 2019 +0100
Centralisation of all api submodules.
---
.../analytics/math3/UnivariateAggregate.java | 2 +-
.../math3/json/JsonUnivariateAggregate.java | 2 +-
.../apache/edgent/analytics/sensors/Deadtime.java | 2 +-
.../apache/edgent/analytics/sensors/Filters.java | 2 +-
api/execution/pom.xml | 49 ------------------
api/function/pom.xml | 37 -------------
api/graph/pom.xml | 45 ----------------
api/oplet/pom.xml | 55 --------------------
api/pom.xml | 16 +++---
.../java/org/apache/edgent/execution/Configs.java | 0
.../apache/edgent/execution/DirectSubmitter.java | 0
.../main/java/org/apache/edgent/execution/Job.java | 24 ++++-----
.../org/apache/edgent/execution/Submitter.java | 4 +-
.../apache/edgent/execution/mbeans/JobMXBean.java | 12 ++---
.../edgent/execution/mbeans/PeriodMXBean.java | 2 +-
.../edgent/execution/mbeans/package-info.java | 0
.../org/apache/edgent/execution/package-info.java | 0
.../edgent/execution/services/ControlService.java | 0
.../apache/edgent/execution/services/Controls.java | 0
.../execution/services/JobRegistryService.java | 0
.../edgent/execution/services/RuntimeServices.java | 0
.../execution/services/ServiceContainer.java | 0
.../edgent/execution/services/package-info.java | 0
.../org/apache/edgent/function/BiConsumer.java | 0
.../org/apache/edgent/function/BiFunction.java | 0
.../java/org/apache/edgent/function/Consumer.java | 0
.../java/org/apache/edgent/function/Function.java | 0
.../java/org/apache/edgent/function/Functions.java | 0
.../java/org/apache/edgent/function/Predicate.java | 0
.../java/org/apache/edgent/function/Supplier.java | 0
.../apache/edgent/function/ToDoubleFunction.java | 0
.../org/apache/edgent/function/ToIntFunction.java | 0
.../org/apache/edgent/function/UnaryOperator.java | 0
.../apache/edgent/function/WrappedFunction.java | 0
.../org/apache/edgent/function/package-info.java | 0
.../java/org/apache/edgent/graph/Connector.java | 4 +-
.../main/java/org/apache/edgent/graph/Edge.java | 0
.../main/java/org/apache/edgent/graph/Graph.java | 12 ++---
.../main/java/org/apache/edgent/graph/Vertex.java | 4 +-
.../java/org/apache/edgent/graph/package-info.java | 2 +-
.../java/org/apache/edgent/oplet/JobContext.java | 0
.../main/java/org/apache/edgent/oplet/Oplet.java | 0
.../java/org/apache/edgent/oplet/OpletContext.java | 0
.../org/apache/edgent/oplet/OutputPortContext.java | 0
.../apache/edgent/oplet/core/AbstractOplet.java | 0
.../java/org/apache/edgent/oplet/core/FanIn.java | 0
.../java/org/apache/edgent/oplet/core/FanOut.java | 0
.../java/org/apache/edgent/oplet/core/Peek.java | 0
.../apache/edgent/oplet/core/PeriodicSource.java | 2 +-
.../java/org/apache/edgent/oplet/core/Pipe.java | 0
.../apache/edgent/oplet/core/ProcessSource.java | 0
.../java/org/apache/edgent/oplet/core/Sink.java | 0
.../java/org/apache/edgent/oplet/core/Source.java | 0
.../java/org/apache/edgent/oplet/core/Split.java | 0
.../java/org/apache/edgent/oplet/core/Union.java | 0
.../edgent/oplet/core/mbeans/package-info.java | 0
.../org/apache/edgent/oplet/core/package-info.java | 0
.../org/apache/edgent/oplet/functional/Events.java | 0
.../org/apache/edgent/oplet/functional/Filter.java | 0
.../apache/edgent/oplet/functional/FlatMap.java | 0
.../org/apache/edgent/oplet/functional/Map.java | 0
.../org/apache/edgent/oplet/functional/Peek.java | 0
.../oplet/functional/SupplierPeriodicSource.java | 0
.../edgent/oplet/functional/SupplierSource.java | 0
.../edgent/oplet/functional/package-info.java | 0
.../java/org/apache/edgent/oplet/package-info.java | 0
.../org/apache/edgent/oplet/plumbing/Barrier.java | 0
.../org/apache/edgent/oplet/plumbing/Isolate.java | 0
.../edgent/oplet/plumbing/PressureReliever.java | 0
.../edgent/oplet/plumbing/UnorderedIsolate.java | 0
.../apache/edgent/oplet/plumbing/package-info.java | 0
.../org/apache/edgent/oplet/window/Aggregate.java | 0
.../apache/edgent/oplet/window/package-info.java | 0
.../java/org/apache/edgent/topology/TSink.java | 0
.../java/org/apache/edgent/topology/TStream.java | 12 ++---
.../java/org/apache/edgent/topology/TWindow.java | 0
.../java/org/apache/edgent/topology/Topology.java | 26 +++++-----
.../apache/edgent/topology/TopologyElement.java | 0
.../apache/edgent/topology/TopologyProvider.java | 10 ++--
.../apache/edgent/topology/doc-files/sources.html | 8 +--
.../apache/edgent/topology/json/JsonFunctions.java | 2 +-
.../apache/edgent/topology/json/package-info.java | 2 +-
.../topology/mbeans/ApplicationServiceMXBean.java | 0
.../edgent/topology/mbeans/package-info.java | 0
.../org/apache/edgent/topology/package-info.java | 2 +-
.../topology/plumbing/LoadBalancedSplitter.java | 0
.../edgent/topology/plumbing/PlumbingStreams.java | 18 +++----
.../org/apache/edgent/topology/plumbing/Valve.java | 0
.../edgent/topology/plumbing/package-info.java | 4 +-
.../topology/services/ApplicationService.java | 10 ++--
.../edgent/topology/services/TopologyBuilder.java | 2 +-
.../edgent/topology/services/package-info.java | 0
.../apache/edgent/topology/tester/Condition.java | 0
.../org/apache/edgent/topology/tester/Tester.java | 22 ++++----
.../edgent/topology/tester/package-info.java | 2 +-
.../apache/edgent/window/InsertionTimeList.java | 0
.../java/org/apache/edgent/window/Partition.java | 0
.../org/apache/edgent/window/PartitionImpl.java | 0
.../org/apache/edgent/window/PartitionedState.java | 0
.../java/org/apache/edgent/window/Policies.java | 0
.../main/java/org/apache/edgent/window/Window.java | 0
.../java/org/apache/edgent/window/WindowImpl.java | 0
.../java/org/apache/edgent/window/Windows.java | 0
.../org/apache/edgent/window/package-info.java | 0
.../org/apache/edgent}/execution/ControlsTest.java | 2 +-
.../org/apache/edgent}/function/FunctionsTest.java | 6 +--
.../apache/edgent}/graph/GraphAbstractTest.java | 5 +-
.../java/org/apache/edgent}/graph/GraphTest.java | 7 +--
.../edgent}/oplet/functional/FilterTest.java | 3 +-
.../apache/edgent}/oplet/operators/PipeTest.java | 2 +-
.../apache/edgent}/topology/JsonFunctionsTest.java | 27 +++++-----
.../org/apache/edgent}/topology/PlumbingTest.java | 9 ++--
.../org/apache/edgent}/topology/TStreamTest.java | 8 +--
.../org/apache/edgent}/topology/TWindowTest.java | 5 +-
.../edgent}/topology/TopologyAbstractTest.java | 7 +--
.../edgent}/topology/TopologyElementTest.java | 6 +--
.../org/apache/edgent}/topology/TopologyTest.java | 4 +-
.../apache/edgent}/topology/TopologyTestSetup.java | 4 +-
.../java/org/apache/edgent}/window/StateTest.java | 2 +-
.../java/org/apache/edgent}/window/WindowTest.java | 2 +-
api/topology/pom.xml | 60 ----------------------
api/window/pom.xml | 45 ----------------
.../apache/edgent/apps/iot/IotDevicePubSub.java | 12 ++---
.../apache/edgent/apps/runtime/JobMonitorApp.java | 12 ++---
.../edgent/connectors/command/CommandStreams.java | 20 ++++----
.../java/org/apache/edgent/connectors/csv/Csv.java | 4 +-
.../apache/edgent/connectors/file/FileStreams.java | 4 +-
.../test/connectors/file/FileStreamsTest.java | 2 +-
.../apache/edgent/connectors/http/HttpStreams.java | 16 +++---
.../apache/edgent/connectors/iot/HeartBeat.java | 2 +-
.../apache/edgent/connectors/iotp/IotpDevice.java | 4 +-
.../apache/edgent/connectors/iotp/IotpGateway.java | 4 +-
.../connectors/iotp/runtime/IotpConnector.java | 2 +-
.../iotp/runtime/IotpDeviceCommands.java | 2 +-
.../connectors/iotp/runtime/IotpGWCommands.java | 2 +-
.../connectors/iotp/runtime/IotpGWConnector.java | 2 +-
.../apache/edgent/connectors/jdbc/JdbcStreams.java | 4 +-
.../apache/edgent/connectors/mqtt/MqttStreams.java | 4 +-
.../edgent/connectors/mqtt/iot/MqttDevice.java | 4 +-
.../connectors/mqtt/MqttStreamsTestManual.java | 4 +-
.../rabbitmq/RabbitmqConfigKeyConstants.java | 2 +-
.../connectors/rabbitmq/RabbitmqConsumer.java | 2 +-
.../connectors/rabbitmq/RabbitmqProducer.java | 2 +-
.../javax/websocket/Jsr356WebSocketClient.java | 6 +--
.../edgent/console/servlets/ConsoleJobServlet.java | 2 +-
.../apache/edgent/console/servlets/JobUtil.java | 2 +-
console/servlets/src/main/webapp/js/graph.js | 6 +--
console/servlets/src/main/webapp/js/index.js | 14 ++---
console/servlets/src/main/webapp/js/streamtags.js | 2 +-
edgent_overview.html | 8 +--
.../edgent/android/hardware/SensorStreams.java | 4 +-
pom.xml | 8 +--
.../providers/development/DevelopmentProvider.java | 6 +--
.../edgent/providers/development/package-info.java | 2 +-
.../providers/dev/DevelopmentProviderTest.java | 4 +-
.../edgent/providers/direct/DirectProvider.java | 6 +--
.../edgent/providers/direct/DirectTopology.java | 4 +-
.../edgent/providers/direct/package-info.java | 2 +-
.../apache/edgent/providers/iot/IotProvider.java | 18 +++----
.../edgent/runtime/appservice/AppService.java | 8 +--
.../runtime/appservice/AppServiceControl.java | 2 +-
.../org/apache/edgent/runtime/etiao/EtiaoJob.java | 6 +--
.../apache/edgent/runtime/etiao/Executable.java | 10 ++--
.../edgent/runtime/etiao/graph/DirectGraph.java | 6 +--
.../runtime/etiao/graph/model/GraphType.java | 8 +--
.../runtime/etiao/graph/model/VertexType.java | 2 +-
.../apache/edgent/runtime/etiao/package-info.java | 4 +-
.../edgent/runtime/jobregistry/JobEvents.java | 4 +-
.../edgent/topology/spi/AbstractTStream.java | 2 +-
.../edgent/topology/spi/graph/ConnectorStream.java | 6 +--
test/GpsObdAnalyticsApplication.properties | 4 +-
.../edgent/test/fvt/iot/IotAppServiceIT.java | 2 +-
.../apache/edgent/test/svt/TopologyTestBasic.java | 2 +-
.../java/org/apache/edgent/metrics/Metrics.java | 8 +--
.../edgent/test/metrics/MetricsEverywhereTest.java | 16 +++---
.../edgent/streamscope/StreamScopeSetup.java | 10 ++--
.../apache/edgent/streamscope/package-info.java | 2 +-
177 files changed, 293 insertions(+), 613 deletions(-)
diff --git a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/UnivariateAggregate.java b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/UnivariateAggregate.java
index 903ee7f..a442ce1 100644
--- a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/UnivariateAggregate.java
+++ b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/UnivariateAggregate.java
@@ -23,7 +23,7 @@ import org.apache.edgent.function.Supplier;
/**
* Univariate aggregate for a tuple.
* This is the declaration of the aggregate that
- * application use when declaring a topology.
+ * application use when declaring a org.apache.edgent.org.apache.edgent.topology.
* <P>
* Implementations are typically enums such
* as {@link org.apache.edgent.analytics.math3.stat.Statistic2 Statistic2}.
diff --git a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/json/JsonUnivariateAggregate.java b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/json/JsonUnivariateAggregate.java
index f0ff3f6..5b7acbb 100644
--- a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/json/JsonUnivariateAggregate.java
+++ b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/json/JsonUnivariateAggregate.java
@@ -23,7 +23,7 @@ import org.apache.edgent.function.Supplier;
/**
* Univariate aggregate for a JSON tuple.
* This is the declaration of the aggregate that
- * application use when declaring a topology.
+ * application use when declaring a org.apache.edgent.org.apache.edgent.topology.
* <P>
* Implementations are typically enums such
* as {@link org.apache.edgent.analytics.math3.stat.Statistic Statistic}.
diff --git a/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Deadtime.java b/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Deadtime.java
index 8407a40..a35be52 100644
--- a/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Deadtime.java
+++ b/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Deadtime.java
@@ -32,7 +32,7 @@ import org.apache.edgent.function.Predicate;
* After the end of a deadtime period, the next call to {@code test()}
* returns true and a new deadtime period is begun.
* </p><p>
- * The deadtime period may be changed while the topology is running
+ * The deadtime period may be changed while the org.apache.edgent.org.apache.edgent.topology is running
* via {@link #setPeriod(long, TimeUnit)}.
* </p>
*
diff --git a/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Filters.java b/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Filters.java
index c0e2f6b..76ef3bc 100644
--- a/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Filters.java
+++ b/analytics/sensors/src/main/java/org/apache/edgent/analytics/sensors/Filters.java
@@ -126,7 +126,7 @@ public class Filters {
* a new deadtime period is begun.
* </p><p>
* Use {@link Deadtime} directly if you need to change the deadtime period
- * while the topology is running.
+ * while the org.apache.edgent.org.apache.edgent.topology is running.
* </p>
* @param <T> tuple type
* @param stream TStream to add deadtime filter to
diff --git a/api/execution/pom.xml b/api/execution/pom.xml
deleted file mode 100644
index 50ff3a3..0000000
--- a/api/execution/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-execution</artifactId>
-
- <name>Apache Edgent (Java 8): API: Execution</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/api/function/pom.xml b/api/function/pom.xml
deleted file mode 100644
index 9b277ff..0000000
--- a/api/function/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-function</artifactId>
-
- <name>Apache Edgent (Java 8): API: Function</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
-</project>
diff --git a/api/graph/pom.xml b/api/graph/pom.xml
deleted file mode 100644
index 7b8aa0e..0000000
--- a/api/graph/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-graph</artifactId>
-
- <name>Apache Edgent (Java 8): API: Graph</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/api/oplet/pom.xml b/api/oplet/pom.xml
deleted file mode 100644
index cbd42d6..0000000
--- a/api/oplet/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-oplet</artifactId>
-
- <name>Apache Edgent (Java 8): API: Oplet</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-window</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/api/pom.xml b/api/pom.xml
index f9f0e39..1d1ba8e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -27,17 +27,15 @@
</parent>
<artifactId>edgent-api</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Apache Edgent (Java 8): API</name>
- <modules>
- <module>execution</module>
- <module>function</module>
- <module>graph</module>
- <module>oplet</module>
- <module>topology</module>
- <module>window</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/Configs.java b/api/src/main/java/org/apache/edgent/execution/Configs.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/Configs.java
rename to api/src/main/java/org/apache/edgent/execution/Configs.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/DirectSubmitter.java b/api/src/main/java/org/apache/edgent/execution/DirectSubmitter.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/DirectSubmitter.java
rename to api/src/main/java/org/apache/edgent/execution/DirectSubmitter.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/Job.java b/api/src/main/java/org/apache/edgent/execution/Job.java
similarity index 85%
rename from api/execution/src/main/java/org/apache/edgent/execution/Job.java
rename to api/src/main/java/org/apache/edgent/execution/Job.java
index fc178ff..541bad0 100644
--- a/api/execution/src/main/java/org/apache/edgent/execution/Job.java
+++ b/api/src/main/java/org/apache/edgent/execution/Job.java
@@ -52,38 +52,38 @@ import java.util.concurrent.TimeoutException;
* The interface provides access to the job nodes
* {@linkplain #getHealth() health summary}, described by the following values:
* <ul>
- * <li><b>HEALTHY</b> All graph nodes in the job are healthy.</li>
- * <li><b>UNHEALTHY</b> At least one graph node in the job is stopped or
+ * <li><b>HEALTHY</b> All org.apache.edgent.graph nodes in the job are healthy.</li>
+ * <li><b>UNHEALTHY</b> At least one org.apache.edgent.graph node in the job is stopped or
* stopping.</li>
* </ul>
*/
public interface Job {
/**
- * States of a graph job.
+ * States of a org.apache.edgent.graph job.
*/
public enum State {
- /** Initial state, the graph nodes are not yet initialized. */
+ /** Initial state, the org.apache.edgent.graph nodes are not yet initialized. */
CONSTRUCTED,
- /** All the graph nodes have been initialized. */
+ /** All the org.apache.edgent.graph nodes have been initialized. */
INITIALIZED,
- /** All the graph nodes are processing data. */
+ /** All the org.apache.edgent.graph nodes are processing data. */
RUNNING,
- /** All the graph nodes are paused. */
+ /** All the org.apache.edgent.graph nodes are paused. */
PAUSED,
- /** All the graph nodes are closed. */
+ /** All the org.apache.edgent.graph nodes are closed. */
CLOSED
}
/**
- * Enumeration for the summarized health indicator of the graph nodes.
+ * Enumeration for the summarized health indicator of the org.apache.edgent.graph nodes.
*/
public enum Health {
/**
- * All graph nodes in the job are healthy.
+ * All org.apache.edgent.graph nodes in the job are healthy.
*/
HEALTHY,
/**
- * The execution of at least one graph node in the job has stopped
+ * The execution of at least one org.apache.edgent.graph node in the job has stopped
* because of an abnormal condition.
*/
UNHEALTHY
@@ -131,7 +131,7 @@ public interface Job {
void stateChange(Action action) throws IllegalArgumentException;
/**
- * Returns the summarized health indicator of the graph nodes.
+ * Returns the summarized health indicator of the org.apache.edgent.graph nodes.
*
* @return the summarized Job node health.
*/
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/Submitter.java b/api/src/main/java/org/apache/edgent/execution/Submitter.java
similarity index 89%
rename from api/execution/src/main/java/org/apache/edgent/execution/Submitter.java
rename to api/src/main/java/org/apache/edgent/execution/Submitter.java
index 531eb4d..660bb1e 100644
--- a/api/execution/src/main/java/org/apache/edgent/execution/Submitter.java
+++ b/api/src/main/java/org/apache/edgent/execution/Submitter.java
@@ -27,8 +27,8 @@ import com.google.gson.JsonObject;
* An interface for submission of an executable.
* <p>
* The class implementing this interface is responsible
- * for the semantics of this operation. e.g., an direct topology
- * provider would run the topology as threads in the current jvm.
+ * for the semantics of this operation. e.g., an direct org.apache.edgent.org.apache.edgent.topology
+ * provider would run the org.apache.edgent.org.apache.edgent.topology as threads in the current jvm.
*
* @param <E> the executable type
* @param <J> the submitted executable's future
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/mbeans/JobMXBean.java b/api/src/main/java/org/apache/edgent/execution/mbeans/JobMXBean.java
similarity index 89%
rename from api/execution/src/main/java/org/apache/edgent/execution/mbeans/JobMXBean.java
rename to api/src/main/java/org/apache/edgent/execution/mbeans/JobMXBean.java
index d28d09b..bf55f1f 100644
--- a/api/execution/src/main/java/org/apache/edgent/execution/mbeans/JobMXBean.java
+++ b/api/src/main/java/org/apache/edgent/execution/mbeans/JobMXBean.java
@@ -77,18 +77,18 @@ public interface JobMXBean {
String getLastError();
/**
- * Takes a current snapshot of the running graph and returns it in JSON format.
+ * Takes a current snapshot of the running org.apache.edgent.graph and returns it in JSON format.
* <p>
- * <b>The graph snapshot JSON format</b>
+ * <b>The org.apache.edgent.graph snapshot JSON format</b>
* <p>
* The top-level object contains two properties:
* <ul>
- * <li>{@code vertices}: Array of JSON objects representing the graph vertices.</li>
- * <li>{@code edges}: Array of JSON objects representing the graph edges (an edge joins two vertices).</li>
+ * <li>{@code vertices}: Array of JSON objects representing the org.apache.edgent.graph vertices.</li>
+ * <li>{@code edges}: Array of JSON objects representing the org.apache.edgent.graph edges (an edge joins two vertices).</li>
* </ul>
* The vertex object contains the following properties:
* <ul>
- * <li>{@code id}: Unique identifier within a graph's JSON representation.</li>
+ * <li>{@code id}: Unique identifier within a org.apache.edgent.graph's JSON representation.</li>
* <li>{@code instance}: The oplet instance from the vertex.</li>
* </ul>
* The edge object contains the following properties:
@@ -99,7 +99,7 @@ public interface JobMXBean {
* <li>{@code targetInputPort}: The identifier of the target oplet input port connected to the edge.</li>
* </ul>
*
- * @return a JSON-formatted string representing the running graph.
+ * @return a JSON-formatted string representing the running org.apache.edgent.graph.
*/
String graphSnapshot();
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/mbeans/PeriodMXBean.java b/api/src/main/java/org/apache/edgent/execution/mbeans/PeriodMXBean.java
similarity index 92%
rename from api/execution/src/main/java/org/apache/edgent/execution/mbeans/PeriodMXBean.java
rename to api/src/main/java/org/apache/edgent/execution/mbeans/PeriodMXBean.java
index 6fe58e7..786c42e 100644
--- a/api/execution/src/main/java/org/apache/edgent/execution/mbeans/PeriodMXBean.java
+++ b/api/src/main/java/org/apache/edgent/execution/mbeans/PeriodMXBean.java
@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
* {@link org.apache.edgent.execution.services.ControlService ControlService}.
* </P>
*
- * See {@code org.apache.edgent.topology.Topology.poll(org.apache.edgent.function.Supplier, long, TimeUnit)}
+ * See {@code org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.Topology.poll(org.apache.edgent.function.Supplier, long, TimeUnit)}
*/
public interface PeriodMXBean {
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/mbeans/package-info.java b/api/src/main/java/org/apache/edgent/execution/mbeans/package-info.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/mbeans/package-info.java
rename to api/src/main/java/org/apache/edgent/execution/mbeans/package-info.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/package-info.java b/api/src/main/java/org/apache/edgent/execution/package-info.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/package-info.java
rename to api/src/main/java/org/apache/edgent/execution/package-info.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/ControlService.java b/api/src/main/java/org/apache/edgent/execution/services/ControlService.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/services/ControlService.java
rename to api/src/main/java/org/apache/edgent/execution/services/ControlService.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/Controls.java b/api/src/main/java/org/apache/edgent/execution/services/Controls.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/services/Controls.java
rename to api/src/main/java/org/apache/edgent/execution/services/Controls.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/JobRegistryService.java b/api/src/main/java/org/apache/edgent/execution/services/JobRegistryService.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/services/JobRegistryService.java
rename to api/src/main/java/org/apache/edgent/execution/services/JobRegistryService.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java b/api/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
rename to api/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/ServiceContainer.java b/api/src/main/java/org/apache/edgent/execution/services/ServiceContainer.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/services/ServiceContainer.java
rename to api/src/main/java/org/apache/edgent/execution/services/ServiceContainer.java
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/package-info.java b/api/src/main/java/org/apache/edgent/execution/services/package-info.java
similarity index 100%
rename from api/execution/src/main/java/org/apache/edgent/execution/services/package-info.java
rename to api/src/main/java/org/apache/edgent/execution/services/package-info.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/BiConsumer.java b/api/src/main/java/org/apache/edgent/function/BiConsumer.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/BiConsumer.java
rename to api/src/main/java/org/apache/edgent/function/BiConsumer.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/BiFunction.java b/api/src/main/java/org/apache/edgent/function/BiFunction.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/BiFunction.java
rename to api/src/main/java/org/apache/edgent/function/BiFunction.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/Consumer.java b/api/src/main/java/org/apache/edgent/function/Consumer.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/Consumer.java
rename to api/src/main/java/org/apache/edgent/function/Consumer.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/Function.java b/api/src/main/java/org/apache/edgent/function/Function.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/Function.java
rename to api/src/main/java/org/apache/edgent/function/Function.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/Functions.java b/api/src/main/java/org/apache/edgent/function/Functions.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/Functions.java
rename to api/src/main/java/org/apache/edgent/function/Functions.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/Predicate.java b/api/src/main/java/org/apache/edgent/function/Predicate.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/Predicate.java
rename to api/src/main/java/org/apache/edgent/function/Predicate.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/Supplier.java b/api/src/main/java/org/apache/edgent/function/Supplier.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/Supplier.java
rename to api/src/main/java/org/apache/edgent/function/Supplier.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/ToDoubleFunction.java b/api/src/main/java/org/apache/edgent/function/ToDoubleFunction.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/ToDoubleFunction.java
rename to api/src/main/java/org/apache/edgent/function/ToDoubleFunction.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/ToIntFunction.java b/api/src/main/java/org/apache/edgent/function/ToIntFunction.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/ToIntFunction.java
rename to api/src/main/java/org/apache/edgent/function/ToIntFunction.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/UnaryOperator.java b/api/src/main/java/org/apache/edgent/function/UnaryOperator.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/UnaryOperator.java
rename to api/src/main/java/org/apache/edgent/function/UnaryOperator.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/WrappedFunction.java b/api/src/main/java/org/apache/edgent/function/WrappedFunction.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/WrappedFunction.java
rename to api/src/main/java/org/apache/edgent/function/WrappedFunction.java
diff --git a/api/function/src/main/java/org/apache/edgent/function/package-info.java b/api/src/main/java/org/apache/edgent/function/package-info.java
similarity index 100%
rename from api/function/src/main/java/org/apache/edgent/function/package-info.java
rename to api/src/main/java/org/apache/edgent/function/package-info.java
diff --git a/api/graph/src/main/java/org/apache/edgent/graph/Connector.java b/api/src/main/java/org/apache/edgent/graph/Connector.java
similarity index 96%
rename from api/graph/src/main/java/org/apache/edgent/graph/Connector.java
rename to api/src/main/java/org/apache/edgent/graph/Connector.java
index 8ffea07..1a200a4 100644
--- a/api/graph/src/main/java/org/apache/edgent/graph/Connector.java
+++ b/api/src/main/java/org/apache/edgent/graph/Connector.java
@@ -42,7 +42,7 @@ import org.apache.edgent.oplet.core.Peek;
* <LI>
* </UL>
* For example with peeks {@code P1,P2,P3} added in that order and connections
- * {@code C1,C2} added, the graph will be logically:
+ * {@code C1,C2} added, the org.apache.edgent.graph will be logically:
*
* <pre>
* {@code
@@ -121,7 +121,7 @@ public interface Connector<T> {
/**
* Set the alias for the connector.
* <p>
- * The alias must be unique within the topology.
+ * The alias must be unique within the org.apache.edgent.org.apache.edgent.topology.
* The alias may be used in various contexts:
* </p>
* <ul>
diff --git a/api/graph/src/main/java/org/apache/edgent/graph/Edge.java b/api/src/main/java/org/apache/edgent/graph/Edge.java
similarity index 100%
rename from api/graph/src/main/java/org/apache/edgent/graph/Edge.java
rename to api/src/main/java/org/apache/edgent/graph/Edge.java
diff --git a/api/graph/src/main/java/org/apache/edgent/graph/Graph.java b/api/src/main/java/org/apache/edgent/graph/Graph.java
similarity index 88%
rename from api/graph/src/main/java/org/apache/edgent/graph/Graph.java
rename to api/src/main/java/org/apache/edgent/graph/Graph.java
index 54748de..ccf4e35 100644
--- a/api/graph/src/main/java/org/apache/edgent/graph/Graph.java
+++ b/api/src/main/java/org/apache/edgent/graph/Graph.java
@@ -27,9 +27,9 @@ import org.apache.edgent.oplet.core.Peek;
import org.apache.edgent.oplet.core.Source;
/**
- * A generic directed graph of vertices, connectors and edges.
+ * A generic directed org.apache.edgent.graph of vertices, connectors and edges.
* <p>
- * The graph consists of {@link Vertex} objects, each having
+ * The org.apache.edgent.graph consists of {@link Vertex} objects, each having
* 0 or more input and/or output {@link Connector} objects.
* {@link Edge} objects connect an output connector to
* an input connector.
@@ -40,7 +40,7 @@ import org.apache.edgent.oplet.core.Source;
public interface Graph {
/**
- * Add a new unconnected {@code Vertex} into the graph.
+ * Add a new unconnected {@code Vertex} into the org.apache.edgent.graph.
* <p>
*
* @param <N> an Oplet type
@@ -96,14 +96,14 @@ public interface Graph {
void peekAll(Supplier<? extends Peek<?>> supplier, Predicate<Vertex<?, ?, ?>> select);
/**
- * Return an unmodifiable view of all vertices in this graph.
+ * Return an unmodifiable view of all vertices in this org.apache.edgent.graph.
*
- * @return unmodifiable view of all vertices in this graph
+ * @return unmodifiable view of all vertices in this org.apache.edgent.graph
*/
Collection<Vertex<? extends Oplet<?, ?>, ?, ?>> getVertices();
/**
- * Return an unmodifiable view of all edges in this graph.
+ * Return an unmodifiable view of all edges in this org.apache.edgent.graph.
* @return the collection
*/
Collection<Edge> getEdges();
diff --git a/api/graph/src/main/java/org/apache/edgent/graph/Vertex.java b/api/src/main/java/org/apache/edgent/graph/Vertex.java
similarity index 95%
rename from api/graph/src/main/java/org/apache/edgent/graph/Vertex.java
rename to api/src/main/java/org/apache/edgent/graph/Vertex.java
index 98d1b83..11c0b4c 100644
--- a/api/graph/src/main/java/org/apache/edgent/graph/Vertex.java
+++ b/api/src/main/java/org/apache/edgent/graph/Vertex.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.edgent.oplet.Oplet;
/**
- * A {@code Vertex} in a graph.
+ * A {@code Vertex} in a org.apache.edgent.graph.
* <p>
* A {@code Vertex} has an {@link Oplet} instance
* that will be executed at runtime and zero or
@@ -38,7 +38,7 @@ public interface Vertex<N extends Oplet<C, P>, C, P> {
/**
* Get the vertice's {@link Graph}.
- * @return the graph
+ * @return the org.apache.edgent.graph
*/
Graph graph();
diff --git a/api/graph/src/main/java/org/apache/edgent/graph/package-info.java b/api/src/main/java/org/apache/edgent/graph/package-info.java
similarity index 94%
rename from api/graph/src/main/java/org/apache/edgent/graph/package-info.java
rename to api/src/main/java/org/apache/edgent/graph/package-info.java
index 26dbf63..28417ec 100644
--- a/api/graph/src/main/java/org/apache/edgent/graph/package-info.java
+++ b/api/src/main/java/org/apache/edgent/graph/package-info.java
@@ -18,7 +18,7 @@ under the License.
*/
/**
- * Low-level graph building API.
+ * Low-level org.apache.edgent.graph building API.
*/
package org.apache.edgent.graph;
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/JobContext.java b/api/src/main/java/org/apache/edgent/oplet/JobContext.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/JobContext.java
rename to api/src/main/java/org/apache/edgent/oplet/JobContext.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/Oplet.java b/api/src/main/java/org/apache/edgent/oplet/Oplet.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/Oplet.java
rename to api/src/main/java/org/apache/edgent/oplet/Oplet.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/OpletContext.java b/api/src/main/java/org/apache/edgent/oplet/OpletContext.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/OpletContext.java
rename to api/src/main/java/org/apache/edgent/oplet/OpletContext.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/OutputPortContext.java b/api/src/main/java/org/apache/edgent/oplet/OutputPortContext.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/OutputPortContext.java
rename to api/src/main/java/org/apache/edgent/oplet/OutputPortContext.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/AbstractOplet.java b/api/src/main/java/org/apache/edgent/oplet/core/AbstractOplet.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/AbstractOplet.java
rename to api/src/main/java/org/apache/edgent/oplet/core/AbstractOplet.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/FanIn.java b/api/src/main/java/org/apache/edgent/oplet/core/FanIn.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/FanIn.java
rename to api/src/main/java/org/apache/edgent/oplet/core/FanIn.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/FanOut.java b/api/src/main/java/org/apache/edgent/oplet/core/FanOut.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/FanOut.java
rename to api/src/main/java/org/apache/edgent/oplet/core/FanOut.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/Peek.java b/api/src/main/java/org/apache/edgent/oplet/core/Peek.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/Peek.java
rename to api/src/main/java/org/apache/edgent/oplet/core/Peek.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/PeriodicSource.java b/api/src/main/java/org/apache/edgent/oplet/core/PeriodicSource.java
similarity index 97%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/PeriodicSource.java
rename to api/src/main/java/org/apache/edgent/oplet/core/PeriodicSource.java
index df7c4af..3cac598 100644
--- a/api/oplet/src/main/java/org/apache/edgent/oplet/core/PeriodicSource.java
+++ b/api/src/main/java/org/apache/edgent/oplet/core/PeriodicSource.java
@@ -51,7 +51,7 @@ public abstract class PeriodicSource<T> extends Source<T> implements Runnable, P
ControlService cs = getOpletContext().getService(ControlService.class);
// TODO BUG HERE: the control alias needs to be unique across the
// entire provider instance (multiple topologies) because the ControlService
- // is provider-wide, not topology specific.
+ // is provider-wide, not org.apache.edgent.org.apache.edgent.topology specific.
// Scope it with just the jobId. What's going to unregister this control?
if (cs != null)
cs.registerControl(TSTREAM_TYPE, getOpletContext().uniquify(getClass().getSimpleName()),
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/Pipe.java b/api/src/main/java/org/apache/edgent/oplet/core/Pipe.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/Pipe.java
rename to api/src/main/java/org/apache/edgent/oplet/core/Pipe.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/ProcessSource.java b/api/src/main/java/org/apache/edgent/oplet/core/ProcessSource.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/ProcessSource.java
rename to api/src/main/java/org/apache/edgent/oplet/core/ProcessSource.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/Sink.java b/api/src/main/java/org/apache/edgent/oplet/core/Sink.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/Sink.java
rename to api/src/main/java/org/apache/edgent/oplet/core/Sink.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/Source.java b/api/src/main/java/org/apache/edgent/oplet/core/Source.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/Source.java
rename to api/src/main/java/org/apache/edgent/oplet/core/Source.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/Split.java b/api/src/main/java/org/apache/edgent/oplet/core/Split.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/Split.java
rename to api/src/main/java/org/apache/edgent/oplet/core/Split.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/Union.java b/api/src/main/java/org/apache/edgent/oplet/core/Union.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/Union.java
rename to api/src/main/java/org/apache/edgent/oplet/core/Union.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/mbeans/package-info.java b/api/src/main/java/org/apache/edgent/oplet/core/mbeans/package-info.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/mbeans/package-info.java
rename to api/src/main/java/org/apache/edgent/oplet/core/mbeans/package-info.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/core/package-info.java b/api/src/main/java/org/apache/edgent/oplet/core/package-info.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/core/package-info.java
rename to api/src/main/java/org/apache/edgent/oplet/core/package-info.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/Events.java b/api/src/main/java/org/apache/edgent/oplet/functional/Events.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/Events.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/Events.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/Filter.java b/api/src/main/java/org/apache/edgent/oplet/functional/Filter.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/Filter.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/Filter.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/FlatMap.java b/api/src/main/java/org/apache/edgent/oplet/functional/FlatMap.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/FlatMap.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/FlatMap.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/Map.java b/api/src/main/java/org/apache/edgent/oplet/functional/Map.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/Map.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/Map.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/Peek.java b/api/src/main/java/org/apache/edgent/oplet/functional/Peek.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/Peek.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/Peek.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/SupplierPeriodicSource.java b/api/src/main/java/org/apache/edgent/oplet/functional/SupplierPeriodicSource.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/SupplierPeriodicSource.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/SupplierPeriodicSource.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/SupplierSource.java b/api/src/main/java/org/apache/edgent/oplet/functional/SupplierSource.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/SupplierSource.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/SupplierSource.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/functional/package-info.java b/api/src/main/java/org/apache/edgent/oplet/functional/package-info.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/functional/package-info.java
rename to api/src/main/java/org/apache/edgent/oplet/functional/package-info.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/package-info.java b/api/src/main/java/org/apache/edgent/oplet/package-info.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/package-info.java
rename to api/src/main/java/org/apache/edgent/oplet/package-info.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/Barrier.java b/api/src/main/java/org/apache/edgent/oplet/plumbing/Barrier.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/Barrier.java
rename to api/src/main/java/org/apache/edgent/oplet/plumbing/Barrier.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/Isolate.java b/api/src/main/java/org/apache/edgent/oplet/plumbing/Isolate.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/Isolate.java
rename to api/src/main/java/org/apache/edgent/oplet/plumbing/Isolate.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/PressureReliever.java b/api/src/main/java/org/apache/edgent/oplet/plumbing/PressureReliever.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/PressureReliever.java
rename to api/src/main/java/org/apache/edgent/oplet/plumbing/PressureReliever.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/UnorderedIsolate.java b/api/src/main/java/org/apache/edgent/oplet/plumbing/UnorderedIsolate.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/UnorderedIsolate.java
rename to api/src/main/java/org/apache/edgent/oplet/plumbing/UnorderedIsolate.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/package-info.java b/api/src/main/java/org/apache/edgent/oplet/plumbing/package-info.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/plumbing/package-info.java
rename to api/src/main/java/org/apache/edgent/oplet/plumbing/package-info.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/window/Aggregate.java b/api/src/main/java/org/apache/edgent/oplet/window/Aggregate.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/window/Aggregate.java
rename to api/src/main/java/org/apache/edgent/oplet/window/Aggregate.java
diff --git a/api/oplet/src/main/java/org/apache/edgent/oplet/window/package-info.java b/api/src/main/java/org/apache/edgent/oplet/window/package-info.java
similarity index 100%
rename from api/oplet/src/main/java/org/apache/edgent/oplet/window/package-info.java
rename to api/src/main/java/org/apache/edgent/oplet/window/package-info.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/TSink.java b/api/src/main/java/org/apache/edgent/topology/TSink.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/TSink.java
rename to api/src/main/java/org/apache/edgent/topology/TSink.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/TStream.java b/api/src/main/java/org/apache/edgent/topology/TStream.java
similarity index 97%
rename from api/topology/src/main/java/org/apache/edgent/topology/TStream.java
rename to api/src/main/java/org/apache/edgent/topology/TStream.java
index e89746f..8a90f02 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/TStream.java
+++ b/api/src/main/java/org/apache/edgent/topology/TStream.java
@@ -36,7 +36,7 @@ import org.apache.edgent.oplet.core.Sink;
/**
* A {@code TStream} is a declaration of a continuous sequence of tuples. A
- * connected topology of streams and functional transformations is built using
+ * connected org.apache.edgent.org.apache.edgent.topology of streams and functional transformations is built using
* {@link Topology}. <BR>
* Generic methods on this interface provide the ability to
* {@link #filter(Predicate) filter}, {@link #map(Function)
@@ -44,8 +44,8 @@ import org.apache.edgent.oplet.core.Sink;
* function.
* <P>
* {@code TStream} is not a runtime representation of a stream,
- * it is a declaration used in building a topology.
- * The actual runtime stream is created once the topology
+ * it is a declaration used in building a org.apache.edgent.org.apache.edgent.topology.
+ * The actual runtime stream is created once the org.apache.edgent.org.apache.edgent.topology
* is {@link org.apache.edgent.execution.Submitter#submit(Object) submitted}
* to a runtime.
*
@@ -61,7 +61,7 @@ public interface TStream<T> extends TopologyElement {
* The value is {@value}
*/
public static final String TYPE = "stream";
- // N.B. to avoid build problems due to topology <=> oplet,
+ // N.B. to avoid build problems due to org.apache.edgent.org.apache.edgent.topology <=> oplet,
// other code contain a copy of this value (ugh) as TSTREAM_TYPE
/**
@@ -256,7 +256,7 @@ public interface TStream<T> extends TopologyElement {
* or dashboards.
* <p>
* If {@code sinker} implements {@link AutoCloseable}, its {@code close()}
- * method will be called when the topology's execution is terminated.
+ * method will be called when the org.apache.edgent.org.apache.edgent.topology's execution is terminated.
* </P>
* <P>
* Example of terminating a stream of {@code String} tuples by printing them
@@ -471,7 +471,7 @@ public interface TStream<T> extends TopologyElement {
/**
* Set an alias for the stream.
* <p>
- * The alias must be unique within the topology.
+ * The alias must be unique within the org.apache.edgent.org.apache.edgent.topology.
* The alias may be used in various contexts:
* </p>
* <ul>
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/TWindow.java b/api/src/main/java/org/apache/edgent/topology/TWindow.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/TWindow.java
rename to api/src/main/java/org/apache/edgent/topology/TWindow.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/Topology.java b/api/src/main/java/org/apache/edgent/topology/Topology.java
similarity index 86%
rename from api/topology/src/main/java/org/apache/edgent/topology/Topology.java
rename to api/src/main/java/org/apache/edgent/topology/Topology.java
index 4d102d5..9c179b5 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/Topology.java
+++ b/api/src/main/java/org/apache/edgent/topology/Topology.java
@@ -30,7 +30,7 @@ import org.apache.edgent.topology.plumbing.PlumbingStreams;
import org.apache.edgent.topology.tester.Tester;
/**
- * A declaration of a topology of streaming data.
+ * A declaration of a org.apache.edgent.org.apache.edgent.topology of streaming data.
*
* This class provides some fundamental generic methods to create source
* streams, such as {@link #source(Supplier) source},
@@ -43,8 +43,8 @@ import org.apache.edgent.topology.tester.Tester;
public interface Topology extends TopologyElement {
/**
- * Name of this topology.
- * @return Name of this topology.
+ * Name of this org.apache.edgent.org.apache.edgent.topology.
+ * @return Name of this org.apache.edgent.org.apache.edgent.topology.
* @see TopologyProvider#newTopology(String)
*/
String getName();
@@ -58,7 +58,7 @@ public interface Topology extends TopologyElement {
* {@code Iterable} never completes.
* <p>
* If {@code data} implements {@link AutoCloseable}, its {@code close()}
- * method will be called when the topology's execution is terminated.
+ * method will be called when the org.apache.edgent.org.apache.edgent.topology's execution is terminated.
*
* @param <T> Tuple type
* @param data
@@ -75,7 +75,7 @@ public interface Topology extends TopologyElement {
* repeatably. Each non-null returned value will be present on the stream.
* <p>
* If {@code data} implements {@link AutoCloseable}, its {@code close()}
- * method will be called when the topology's execution is terminated.
+ * method will be called when the org.apache.edgent.org.apache.edgent.topology's execution is terminated.
*
* @param <T> Tuple type
* @param data
@@ -94,12 +94,12 @@ public interface Topology extends TopologyElement {
* the stream.
* <p>
* If {@code data} implements {@link AutoCloseable}, its {@code close()}
- * method will be called when the topology's execution is terminated.
+ * method will be called when the org.apache.edgent.org.apache.edgent.topology's execution is terminated.
* </p><p>
- * The poll rate may be changed when the topology is running via a runtime
+ * The poll rate may be changed when the org.apache.edgent.org.apache.edgent.topology is running via a runtime
* {@link org.apache.edgent.execution.mbeans.PeriodMXBean PeriodMXBean}.
* In order to use this mechanism the caller must provide a
- * alias for the stream when building the topology.
+ * alias for the stream when building the org.apache.edgent.org.apache.edgent.topology.
* The {@code PeriodMXBean} is registered with the {@link ControlService}
* with type {@link TStream#TYPE} and the stream's alias.
* e.g.,
@@ -146,7 +146,7 @@ public interface Topology extends TopologyElement {
* </P>
* <p>
* If {@code eventSetup} implements {@link AutoCloseable}, its {@code close()}
- * method will be called when the topology's execution is terminated.
+ * method will be called when the org.apache.edgent.org.apache.edgent.topology's execution is terminated.
* </P>
*
* @param <T> Tuple type
@@ -185,15 +185,15 @@ public interface Topology extends TopologyElement {
<T> TStream<T> collection(Collection<T> tuples);
/**
- * Get the tester for this topology.
+ * Get the tester for this org.apache.edgent.org.apache.edgent.topology.
*
- * @return tester for this topology.
+ * @return tester for this org.apache.edgent.org.apache.edgent.topology.
*/
Tester getTester();
/**
- * Get the underlying graph.
- * @return the underlying graph.
+ * Get the underlying org.apache.edgent.graph.
+ * @return the underlying org.apache.edgent.graph.
*/
Graph graph();
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/TopologyElement.java b/api/src/main/java/org/apache/edgent/topology/TopologyElement.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/TopologyElement.java
rename to api/src/main/java/org/apache/edgent/topology/TopologyElement.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/TopologyProvider.java b/api/src/main/java/org/apache/edgent/topology/TopologyProvider.java
similarity index 73%
rename from api/topology/src/main/java/org/apache/edgent/topology/TopologyProvider.java
rename to api/src/main/java/org/apache/edgent/topology/TopologyProvider.java
index 5040b6e..93b96da 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/TopologyProvider.java
+++ b/api/src/main/java/org/apache/edgent/topology/TopologyProvider.java
@@ -25,18 +25,18 @@ package org.apache.edgent.topology;
public interface TopologyProvider {
/**
- * Create a new topology with a given name.
+ * Create a new org.apache.edgent.org.apache.edgent.topology with a given name.
*
- * @param name name for topology
- * @return A new topology.
+ * @param name name for org.apache.edgent.org.apache.edgent.topology
+ * @return A new org.apache.edgent.org.apache.edgent.topology.
* @throws IllegalArgumentException for null or empty name
*/
Topology newTopology(String name);
/**
- * Create a new topology with a generated name.
+ * Create a new org.apache.edgent.org.apache.edgent.topology with a generated name.
*
- * @return A new topology.
+ * @return A new org.apache.edgent.org.apache.edgent.topology.
*/
Topology newTopology();
}
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/doc-files/sources.html b/api/src/main/java/org/apache/edgent/topology/doc-files/sources.html
similarity index 94%
rename from api/topology/src/main/java/org/apache/edgent/topology/doc-files/sources.html
rename to api/src/main/java/org/apache/edgent/topology/doc-files/sources.html
index 2a6b260..5bca883 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/doc-files/sources.html
+++ b/api/src/main/java/org/apache/edgent/topology/doc-files/sources.html
@@ -62,7 +62,7 @@ To declare a stream in a topology that will result in the sensor being read ever
an application uses a lambda expression as the function and passes it to <code>poll()</code>:
<pre>
<code>
- TStream<Double> oilTemps = topology.poll(() -> EngineInfo.getOilTemperature(), 100, TimeUnit.MILLISECONDS);
+ TStream<Double> oilTemps = org.apache.edgent.org.apache.edgent.topology.poll(() -> EngineInfo.getOilTemperature(), 100, TimeUnit.MILLISECONDS);
</code>
</pre>
At runtime this results in a stream containing a new tuple approximately every 100ms
@@ -76,7 +76,7 @@ downstream processing.
Here's an example of representing the same oil temperature as a JSON object:
<pre>
<code>
- TStream<JsonObject> oilTemps = topology.poll(() ->
+ TStream<JsonObject> oilTemps = org.apache.edgent.org.apache.edgent.topology.poll(() ->
{
JsonObject j = new JsonObject();
j.addProperty("id", "oilTemp");
@@ -102,7 +102,7 @@ With this example the function is similar to the polling example, the only diffe
call to get the sensor reading blocks :
<pre>
<code>
- TStream<JsonObject> drillDepths = topology.generate(() ->
+ TStream<JsonObject> drillDepths = org.apache.edgent.org.apache.edgent.topology.generate(() ->
{
JsonObject j = new JsonObject();
j.addProperty("id", "drillDepth");
@@ -156,7 +156,7 @@ Here's an example of creating a stream of sensor events in Android.
// Note for clarity the application function is implemented as a lambda expression
- TStream<SensorEventt> tempSensor = topology.events(eventSubmitter ->
+ TStream<SensorEventt> tempSensor = org.apache.edgent.org.apache.edgent.topology.events(eventSubmitter ->
mSensorManager.registerListener(
new SensorChangeEvents(eventSubmitter),
Sensor.TYPE_AMBIENT_TEMPERATURE,
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/json/JsonFunctions.java b/api/src/main/java/org/apache/edgent/topology/json/JsonFunctions.java
similarity index 98%
rename from api/topology/src/main/java/org/apache/edgent/topology/json/JsonFunctions.java
rename to api/src/main/java/org/apache/edgent/topology/json/JsonFunctions.java
index fe744ec..992c32e 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/json/JsonFunctions.java
+++ b/api/src/main/java/org/apache/edgent/topology/json/JsonFunctions.java
@@ -27,7 +27,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
/**
- * Utilities for use of JSON and Json Objects in a streaming topology.
+ * Utilities for use of JSON and Json Objects in a streaming org.apache.edgent.org.apache.edgent.topology.
*/
public class JsonFunctions {
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/json/package-info.java b/api/src/main/java/org/apache/edgent/topology/json/package-info.java
similarity index 85%
rename from api/topology/src/main/java/org/apache/edgent/topology/json/package-info.java
rename to api/src/main/java/org/apache/edgent/topology/json/package-info.java
index 2844f34..bffa737 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/json/package-info.java
+++ b/api/src/main/java/org/apache/edgent/topology/json/package-info.java
@@ -18,6 +18,6 @@ under the License.
*/
/**
- * Utilities for use of JSON in a streaming topology.
+ * Utilities for use of JSON in a streaming org.apache.edgent.org.apache.edgent.topology.
*/
package org.apache.edgent.topology.json;
\ No newline at end of file
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/mbeans/ApplicationServiceMXBean.java b/api/src/main/java/org/apache/edgent/topology/mbeans/ApplicationServiceMXBean.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/mbeans/ApplicationServiceMXBean.java
rename to api/src/main/java/org/apache/edgent/topology/mbeans/ApplicationServiceMXBean.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/mbeans/package-info.java b/api/src/main/java/org/apache/edgent/topology/mbeans/package-info.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/mbeans/package-info.java
rename to api/src/main/java/org/apache/edgent/topology/mbeans/package-info.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/package-info.java b/api/src/main/java/org/apache/edgent/topology/package-info.java
similarity index 93%
rename from api/topology/src/main/java/org/apache/edgent/topology/package-info.java
rename to api/src/main/java/org/apache/edgent/topology/package-info.java
index 441cc07..47fc749 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/package-info.java
+++ b/api/src/main/java/org/apache/edgent/topology/package-info.java
@@ -18,7 +18,7 @@ under the License.
*/
/**
- * Functional api to build a streaming topology.
+ * Functional api to build a streaming org.apache.edgent.org.apache.edgent.topology.
*
* <h2>Bringing data into Edgent</h2>
* Data, for example device events, to be be processed and analyzed by Edgent
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/plumbing/LoadBalancedSplitter.java b/api/src/main/java/org/apache/edgent/topology/plumbing/LoadBalancedSplitter.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/plumbing/LoadBalancedSplitter.java
rename to api/src/main/java/org/apache/edgent/topology/plumbing/LoadBalancedSplitter.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/plumbing/PlumbingStreams.java b/api/src/main/java/org/apache/edgent/topology/plumbing/PlumbingStreams.java
similarity index 97%
rename from api/topology/src/main/java/org/apache/edgent/topology/plumbing/PlumbingStreams.java
rename to api/src/main/java/org/apache/edgent/topology/plumbing/PlumbingStreams.java
index 0df80ad..e54cd4b 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/plumbing/PlumbingStreams.java
+++ b/api/src/main/java/org/apache/edgent/topology/plumbing/PlumbingStreams.java
@@ -38,7 +38,7 @@ import org.apache.edgent.topology.TopologyProvider;
/**
* Plumbing utilities for {@link TStream}.
- * Methods that manipulate the flow of tuples in a streaming topology,
+ * Methods that manipulate the flow of tuples in a streaming org.apache.edgent.org.apache.edgent.topology,
* but are not part of the logic of the application.
*/
public class PlumbingStreams {
@@ -87,7 +87,7 @@ public class PlumbingStreams {
* <p>
* Sample use:
* <pre>{@code
- * TStream<String> stream = topology.strings("a", "b, "c");
+ * TStream<String> stream = org.apache.edgent.org.apache.edgent.topology.strings("a", "b, "c");
* // Create a stream with tuples throttled to 1 second intervals.
* TStream<String> throttledStream = blockingThrottle(stream, 1, TimeUnit.SECOND);
* // print out the throttled tuples as they arrive
@@ -146,7 +146,7 @@ public class PlumbingStreams {
* <p>
* Sample use:
* <pre>{@code
- * TStream<String> stream = topology.strings("a", "b, "c");
+ * TStream<String> stream = org.apache.edgent.org.apache.edgent.topology.strings("a", "b, "c");
* // create a stream where the first tuple is delayed by 5 seconds.
* TStream<String> oneShotDelayedStream =
* stream.map( blockingOneShotDelay(5, TimeUnit.SECONDS) );
@@ -309,7 +309,7 @@ public class PlumbingStreams {
* <pre>{@code
* sensorReadings<T> -> A1 -> A2 -> A3 -> results<R>
* }</pre>
- * create a graph that's logically like this:
+ * create a org.apache.edgent.graph that's logically like this:
* <pre>{@code
* -
* |-> A1 ->|
@@ -317,7 +317,7 @@ public class PlumbingStreams {
* |-> A3 ->|
*
* }</pre>
- * more specifically a graph like this:
+ * more specifically a org.apache.edgent.graph like this:
* <pre>{@code
* -
* |-> isolate(1) -> pipeline1 -> |
@@ -353,7 +353,7 @@ public class PlumbingStreams {
* @param <R> Tuple type of the result.
*
* @param stream input stream
- * @param pipelines a list of functions to add a pipeline to the topology.
+ * @param pipelines a list of functions to add a pipeline to the org.apache.edgent.org.apache.edgent.topology.
* Each {@code pipeline.apply()} is called with {@code stream}
* as the input, yielding the pipeline's result stream.
* For each input tuple, a pipeline MUST create exactly one output tuple.
@@ -476,7 +476,7 @@ public class PlumbingStreams {
* </P><P>
* A common splitter function is a {@link #roundRobinSplitter(int) roundRobinSplitter}.
* </P><P>
- * The generated graph looks like this:
+ * The generated org.apache.edgent.graph looks like this:
* </P>
* <pre>{@code
* -
@@ -546,7 +546,7 @@ public class PlumbingStreams {
* </P><P>
* A {@link LoadBalancedSplitter} is used to distribute tuples.
* </P><P>
- * The generated graph looks like this:
+ * The generated org.apache.edgent.graph looks like this:
* </P>
* <pre>{@code
* -
@@ -635,7 +635,7 @@ public class PlumbingStreams {
* Elsewhere, some code calls {@link Semaphore#release(int)}
* to make permits available.
* </P><P>
- * If a TopologyProvider is used that can distribute a topology's
+ * If a TopologyProvider is used that can distribute a org.apache.edgent.org.apache.edgent.topology's
* streams to different JVM's the gate and the code releasing the
* permits must be in the same JVM.
* </P><P>
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/plumbing/Valve.java b/api/src/main/java/org/apache/edgent/topology/plumbing/Valve.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/plumbing/Valve.java
rename to api/src/main/java/org/apache/edgent/topology/plumbing/Valve.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/plumbing/package-info.java b/api/src/main/java/org/apache/edgent/topology/plumbing/package-info.java
similarity index 82%
rename from api/topology/src/main/java/org/apache/edgent/topology/plumbing/package-info.java
rename to api/src/main/java/org/apache/edgent/topology/plumbing/package-info.java
index 29952e5..31c08b7 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/plumbing/package-info.java
+++ b/api/src/main/java/org/apache/edgent/topology/plumbing/package-info.java
@@ -18,8 +18,8 @@ under the License.
*/
/**
- * Plumbing for a streaming topology.
- * Methods that manipulate the flow of tuples in a streaming topology,
+ * Plumbing for a streaming org.apache.edgent.org.apache.edgent.topology.
+ * Methods that manipulate the flow of tuples in a streaming org.apache.edgent.org.apache.edgent.topology,
* but are not part of the logic of the application.
*/
package org.apache.edgent.topology.plumbing;
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/services/ApplicationService.java b/api/src/main/java/org/apache/edgent/topology/services/ApplicationService.java
similarity index 84%
rename from api/topology/src/main/java/org/apache/edgent/topology/services/ApplicationService.java
rename to api/src/main/java/org/apache/edgent/topology/services/ApplicationService.java
index 7cec4ee..4199e94 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/services/ApplicationService.java
+++ b/api/src/main/java/org/apache/edgent/topology/services/ApplicationService.java
@@ -47,21 +47,21 @@ public interface ApplicationService {
String SYSTEM_APP_PREFIX = "edgent";
/**
- * Add a topology that can be started though a control mbean.
+ * Add a org.apache.edgent.org.apache.edgent.topology that can be started though a control mbean.
* Any registration replaces any existing application with the same name.
* <BR>
* When a {@link ApplicationServiceMXBean#submit(String, String) submit}
- * is invoked {@code builder.accept(topology, config)} is called passing:
+ * is invoked {@code builder.accept(org.apache.edgent.org.apache.edgent.topology, config)} is called passing:
* <UL>
* <LI>
- * {@code topology} - An empty topology with the name {@code applicationName}.
+ * {@code org.apache.edgent.org.apache.edgent.topology} - An empty org.apache.edgent.org.apache.edgent.topology with the name {@code applicationName}.
* </LI>
* <LI>
* {@code config} - JSON submission configuration from
* {@link ApplicationServiceMXBean#submit(String, String) submit}.
* </LI>
* </UL>
- * Once {@code builder.accept(topology, config)} returns it is submitted
+ * Once {@code builder.accept(org.apache.edgent.org.apache.edgent.topology, config)} returns it is submitted
* to the {@link Submitter} associated with the implementation of this service.
* <P>
* Application names starting with {@link #SYSTEM_APP_PREFIX edgent} are reserved
@@ -69,7 +69,7 @@ public interface ApplicationService {
* </P>
*
* @param applicationName Application name to register.
- * @param builder How to build the topology for this application.
+ * @param builder How to build the org.apache.edgent.org.apache.edgent.topology for this application.
*
* @see ApplicationServiceMXBean
*/
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/services/TopologyBuilder.java b/api/src/main/java/org/apache/edgent/topology/services/TopologyBuilder.java
similarity index 94%
rename from api/topology/src/main/java/org/apache/edgent/topology/services/TopologyBuilder.java
rename to api/src/main/java/org/apache/edgent/topology/services/TopologyBuilder.java
index be32b1c..4057ffd 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/services/TopologyBuilder.java
+++ b/api/src/main/java/org/apache/edgent/topology/services/TopologyBuilder.java
@@ -24,7 +24,7 @@ import org.apache.edgent.topology.Topology;
import com.google.gson.JsonObject;
/**
- * Represents an topology that can be built.
+ * Represents an org.apache.edgent.org.apache.edgent.topology that can be built.
*
* A class implementing {@code TopologyBuilder} can
* be registered as a service provider in a jar file for
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/services/package-info.java b/api/src/main/java/org/apache/edgent/topology/services/package-info.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/services/package-info.java
rename to api/src/main/java/org/apache/edgent/topology/services/package-info.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/tester/Condition.java b/api/src/main/java/org/apache/edgent/topology/tester/Condition.java
similarity index 100%
rename from api/topology/src/main/java/org/apache/edgent/topology/tester/Condition.java
rename to api/src/main/java/org/apache/edgent/topology/tester/Condition.java
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/tester/Tester.java b/api/src/main/java/org/apache/edgent/topology/tester/Tester.java
similarity index 85%
rename from api/topology/src/main/java/org/apache/edgent/topology/tester/Tester.java
rename to api/src/main/java/org/apache/edgent/topology/tester/Tester.java
index 22fc52c..1649a51 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/tester/Tester.java
+++ b/api/src/main/java/org/apache/edgent/topology/tester/Tester.java
@@ -30,7 +30,7 @@ import org.apache.edgent.topology.TopologyElement;
import com.google.gson.JsonObject;
/**
- * A {@code Tester} adds the ability to test a topology in a test framework such
+ * A {@code Tester} adds the ability to test a org.apache.edgent.org.apache.edgent.topology in a test framework such
* as JUnit.
*
* The main feature is the ability to capture tuples from a {@link TStream} in
@@ -56,7 +56,7 @@ public interface Tester extends TopologyElement {
* The {@link Condition#getResult() result} of the returned
* {@code Condition} is the number of tuples seen on {@code stream} so far.
* <BR>
- * If the topology is still executing then the returned values from
+ * If the org.apache.edgent.org.apache.edgent.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>
*
@@ -77,7 +77,7 @@ public interface Tester extends TopologyElement {
* The {@link Condition#getResult() result} of the returned
* {@code Condition} is the number of tuples seen on {@code stream} so far.
* <BR>
- * If the topology is still executing then the returned values from
+ * If the org.apache.edgent.org.apache.edgent.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>
*
@@ -95,7 +95,7 @@ public interface Tester extends TopologyElement {
* tuples matching {@code values} in the same order. <BR>
* The {@link Condition#getResult() result} of the returned
* {@code Condition} is the tuples seen on {@code stream} so far. <BR>
- * If the topology is still executing then the returned values from
+ * If the org.apache.edgent.org.apache.edgent.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>
*
@@ -115,7 +115,7 @@ public interface Tester extends TopologyElement {
* tuples matching {@code values} in any order. <BR>
* The {@link Condition#getResult() result} of the returned
* {@code Condition} is the tuples seen on {@code stream} so far. <BR>
- * If the topology is still executing then the returned values from
+ * If the org.apache.edgent.org.apache.edgent.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>
*
@@ -139,8 +139,8 @@ public interface Tester extends TopologyElement {
Condition<Boolean> and(final Condition<?>... conditions);
/**
- * Submit the topology for this tester and wait for it to complete, or reach
- * an end condition. If the topology does not complete or reach its end
+ * Submit the org.apache.edgent.org.apache.edgent.topology for this tester and wait for it to complete, or reach
+ * an end condition. If the org.apache.edgent.org.apache.edgent.topology does not complete or reach its end
* condition before {@code timeout} then it is terminated.
* <P>
* End condition is usually a {@link Condition} returned from
@@ -159,21 +159,21 @@ public interface Tester extends TopologyElement {
* @param endCondition
* Condition that will cause this method to return if it is true.
* @param timeout
- * Maximum time to wait for the topology to complete or reach its
+ * Maximum time to wait for the org.apache.edgent.org.apache.edgent.topology to complete or reach its
* end condition.
* @param unit
* Unit for {@code timeout}.
* @return The value of {@code endCondition.valid()}.
*
* @throws Exception
- * Failure submitting or executing the topology.
+ * Failure submitting or executing the org.apache.edgent.org.apache.edgent.topology.
*/
boolean complete(Submitter<Topology, ? extends Job> submitter, JsonObject config, Condition<?> endCondition,
long timeout, TimeUnit unit) throws Exception;
/**
- * Get the {@code Job} reference for the topology submitted by {@code complete()}.
- * @return {@code Job} reference for the topology submitted by {@code complete()}.
+ * Get the {@code Job} reference for the org.apache.edgent.org.apache.edgent.topology submitted by {@code complete()}.
+ * @return {@code Job} reference for the org.apache.edgent.org.apache.edgent.topology submitted by {@code complete()}.
* Null if the {@code complete()} has not been called or the {@code Job} instance is not yet available.
*/
Job getJob();
diff --git a/api/topology/src/main/java/org/apache/edgent/topology/tester/package-info.java b/api/src/main/java/org/apache/edgent/topology/tester/package-info.java
similarity index 91%
rename from api/topology/src/main/java/org/apache/edgent/topology/tester/package-info.java
rename to api/src/main/java/org/apache/edgent/topology/tester/package-info.java
index d160725..7de879f 100644
--- a/api/topology/src/main/java/org/apache/edgent/topology/tester/package-info.java
+++ b/api/src/main/java/org/apache/edgent/topology/tester/package-info.java
@@ -18,7 +18,7 @@ under the License.
*/
/**
- * Testing for a streaming topology.
+ * Testing for a streaming org.apache.edgent.org.apache.edgent.topology.
*/
package org.apache.edgent.topology.tester;
diff --git a/api/window/src/main/java/org/apache/edgent/window/InsertionTimeList.java b/api/src/main/java/org/apache/edgent/window/InsertionTimeList.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/InsertionTimeList.java
rename to api/src/main/java/org/apache/edgent/window/InsertionTimeList.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/Partition.java b/api/src/main/java/org/apache/edgent/window/Partition.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/Partition.java
rename to api/src/main/java/org/apache/edgent/window/Partition.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/PartitionImpl.java b/api/src/main/java/org/apache/edgent/window/PartitionImpl.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/PartitionImpl.java
rename to api/src/main/java/org/apache/edgent/window/PartitionImpl.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/PartitionedState.java b/api/src/main/java/org/apache/edgent/window/PartitionedState.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/PartitionedState.java
rename to api/src/main/java/org/apache/edgent/window/PartitionedState.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/Policies.java b/api/src/main/java/org/apache/edgent/window/Policies.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/Policies.java
rename to api/src/main/java/org/apache/edgent/window/Policies.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/Window.java b/api/src/main/java/org/apache/edgent/window/Window.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/Window.java
rename to api/src/main/java/org/apache/edgent/window/Window.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/WindowImpl.java b/api/src/main/java/org/apache/edgent/window/WindowImpl.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/WindowImpl.java
rename to api/src/main/java/org/apache/edgent/window/WindowImpl.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/Windows.java b/api/src/main/java/org/apache/edgent/window/Windows.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/Windows.java
rename to api/src/main/java/org/apache/edgent/window/Windows.java
diff --git a/api/window/src/main/java/org/apache/edgent/window/package-info.java b/api/src/main/java/org/apache/edgent/window/package-info.java
similarity index 100%
rename from api/window/src/main/java/org/apache/edgent/window/package-info.java
rename to api/src/main/java/org/apache/edgent/window/package-info.java
diff --git a/api/execution/src/test/java/org/apache/edgent/test/execution/ControlsTest.java b/api/src/test/java/org/apache/edgent/execution/ControlsTest.java
similarity index 97%
rename from api/execution/src/test/java/org/apache/edgent/test/execution/ControlsTest.java
rename to api/src/test/java/org/apache/edgent/execution/ControlsTest.java
index 2b42a7d..93b8000 100644
--- a/api/execution/src/test/java/org/apache/edgent/test/execution/ControlsTest.java
+++ b/api/src/test/java/org/apache/edgent/execution/ControlsTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.execution;
+package org.apache.edgent.execution;
import static org.apache.edgent.execution.services.Controls.isControlServiceMBean;
import static org.junit.Assert.assertFalse;
diff --git a/api/function/src/test/java/org/apache/edgent/test/function/FunctionsTest.java b/api/src/test/java/org/apache/edgent/function/FunctionsTest.java
similarity index 97%
rename from api/function/src/test/java/org/apache/edgent/test/function/FunctionsTest.java
rename to api/src/test/java/org/apache/edgent/function/FunctionsTest.java
index 903f071..fae88d8 100644
--- a/api/function/src/test/java/org/apache/edgent/test/function/FunctionsTest.java
+++ b/api/src/test/java/org/apache/edgent/function/FunctionsTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.function;
+package org.apache.edgent.function;
import static org.apache.edgent.function.Functions.identity;
import static org.apache.edgent.function.Functions.unpartitioned;
@@ -28,10 +28,6 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.edgent.function.Consumer;
-import org.apache.edgent.function.Function;
-import org.apache.edgent.function.Functions;
-import org.apache.edgent.function.Supplier;
import org.junit.Test;
public class FunctionsTest {
diff --git a/api/graph/src/test/java/org/apache/edgent/test/graph/GraphAbstractTest.java b/api/src/test/java/org/apache/edgent/graph/GraphAbstractTest.java
similarity index 88%
rename from api/graph/src/test/java/org/apache/edgent/test/graph/GraphAbstractTest.java
rename to api/src/test/java/org/apache/edgent/graph/GraphAbstractTest.java
index 379c3b3..325bc86 100644
--- a/api/graph/src/test/java/org/apache/edgent/test/graph/GraphAbstractTest.java
+++ b/api/src/test/java/org/apache/edgent/graph/GraphAbstractTest.java
@@ -16,13 +16,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.graph;
+package org.apache.edgent.graph;
-import org.apache.edgent.graph.Graph;
import org.junit.Before;
import org.junit.Ignore;
-@Ignore("Abstract class proiding generic graph testing.")
+@Ignore("Abstract class proiding generic org.apache.edgent.graph testing.")
public abstract class GraphAbstractTest {
private Graph graph;
diff --git a/api/graph/src/test/java/org/apache/edgent/test/graph/GraphTest.java b/api/src/test/java/org/apache/edgent/graph/GraphTest.java
similarity index 94%
rename from api/graph/src/test/java/org/apache/edgent/test/graph/GraphTest.java
rename to api/src/test/java/org/apache/edgent/graph/GraphTest.java
index 0b60008..af5df3d 100644
--- a/api/graph/src/test/java/org/apache/edgent/test/graph/GraphTest.java
+++ b/api/src/test/java/org/apache/edgent/graph/GraphTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.graph;
+package org.apache.edgent.graph;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -29,9 +29,6 @@ import java.util.Collection;
import java.util.List;
import org.apache.edgent.function.Consumer;
-import org.apache.edgent.graph.Edge;
-import org.apache.edgent.graph.Graph;
-import org.apache.edgent.graph.Vertex;
import org.apache.edgent.oplet.Oplet;
import org.apache.edgent.oplet.core.AbstractOplet;
import org.junit.Ignore;
@@ -67,7 +64,7 @@ public abstract class GraphTest extends GraphAbstractTest {
try {
c.clear();
- fail("Was able to modify graph collection");
+ fail("Was able to modify org.apache.edgent.graph collection");
} catch (UnsupportedOperationException e) {
// ok - expected
}
diff --git a/api/oplet/src/test/java/org/apache/edgent/test/oplet/functional/FilterTest.java b/api/src/test/java/org/apache/edgent/oplet/functional/FilterTest.java
similarity index 91%
rename from api/oplet/src/test/java/org/apache/edgent/test/oplet/functional/FilterTest.java
rename to api/src/test/java/org/apache/edgent/oplet/functional/FilterTest.java
index bcd3840..bec25cf 100644
--- a/api/oplet/src/test/java/org/apache/edgent/test/oplet/functional/FilterTest.java
+++ b/api/src/test/java/org/apache/edgent/oplet/functional/FilterTest.java
@@ -16,12 +16,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.oplet.functional;
+package org.apache.edgent.oplet.functional;
import static org.junit.Assert.assertTrue;
import org.apache.edgent.oplet.core.Pipe;
-import org.apache.edgent.oplet.functional.Filter;
import org.junit.Test;
public class FilterTest {
diff --git a/api/oplet/src/test/java/org/apache/edgent/test/oplet/operators/PipeTest.java b/api/src/test/java/org/apache/edgent/oplet/operators/PipeTest.java
similarity index 97%
rename from api/oplet/src/test/java/org/apache/edgent/test/oplet/operators/PipeTest.java
rename to api/src/test/java/org/apache/edgent/oplet/operators/PipeTest.java
index d1077f5..82ddf74 100644
--- a/api/oplet/src/test/java/org/apache/edgent/test/oplet/operators/PipeTest.java
+++ b/api/src/test/java/org/apache/edgent/oplet/operators/PipeTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.oplet.operators;
+package org.apache.edgent.oplet.operators;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/JsonFunctionsTest.java b/api/src/test/java/org/apache/edgent/topology/JsonFunctionsTest.java
similarity index 80%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/JsonFunctionsTest.java
rename to api/src/test/java/org/apache/edgent/topology/JsonFunctionsTest.java
index e9a031e..58e852b 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/JsonFunctionsTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/JsonFunctionsTest.java
@@ -16,12 +16,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.junit.Assert.assertEquals;
import org.apache.edgent.function.Function;
import org.apache.edgent.topology.json.JsonFunctions;
+import org.junit.Assert;
import org.junit.Test;
import com.google.gson.JsonArray;
@@ -62,7 +63,7 @@ public class JsonFunctionsTest {
String s1 = asString.apply(jo1);
JsonObject jo2 = fromString.apply(s1);
- assertEquals(jo2, jo1);
+ Assert.assertEquals(jo2, jo1);
}
@Test
@@ -74,51 +75,51 @@ public class JsonFunctionsTest {
byte[] b1 = asBytes.apply(jo1);
JsonObject jo2 = fromBytes.apply(b1);
- assertEquals(jo2, jo1);
+ Assert.assertEquals(jo2, jo1);
}
@Test
public void testUnpartitioned() {
Function<JsonObject,JsonElement> unpartitionedFn = JsonFunctions.unpartitioned();
- assertEquals(0, unpartitionedFn.apply(new JsonObject()).getAsInt());
+ Assert.assertEquals(0, unpartitionedFn.apply(new JsonObject()).getAsInt());
}
@Test
public void testValueOfNumber() {
JsonObject joShort = JsonFunctions.valueOfNumber("propName").apply(Short.MAX_VALUE);
- assertEquals(Short.MAX_VALUE, joShort.get("propName").getAsShort());
+ Assert.assertEquals(Short.MAX_VALUE, joShort.get("propName").getAsShort());
JsonObject joInt = JsonFunctions.valueOfNumber("propName").apply(Integer.MAX_VALUE);
- assertEquals(Integer.MAX_VALUE, joInt.get("propName").getAsInt());
+ Assert.assertEquals(Integer.MAX_VALUE, joInt.get("propName").getAsInt());
JsonObject joLong = JsonFunctions.valueOfNumber("propName").apply(Long.MAX_VALUE);
- assertEquals(Long.MAX_VALUE, joLong.get("propName").getAsLong());
+ Assert.assertEquals(Long.MAX_VALUE, joLong.get("propName").getAsLong());
JsonObject joFloat = JsonFunctions.valueOfNumber("propName").apply(Float.MAX_VALUE);
- assertEquals(Float.MAX_VALUE, joFloat.get("propName").getAsFloat(), 0.0f);
+ Assert.assertEquals(Float.MAX_VALUE, joFloat.get("propName").getAsFloat(), 0.0f);
JsonObject joDouble = JsonFunctions.valueOfNumber("propName").apply(Double.MAX_VALUE);
- assertEquals(Double.MAX_VALUE, joDouble.get("propName").getAsDouble(), 0.0d);
+ Assert.assertEquals(Double.MAX_VALUE, joDouble.get("propName").getAsDouble(), 0.0d);
}
@Test
public void testValueOfBoolean() {
JsonObject joTrue = JsonFunctions.valueOfBoolean("propName").apply(true);
- assertEquals(true, joTrue.get("propName").getAsBoolean());
+ Assert.assertEquals(true, joTrue.get("propName").getAsBoolean());
JsonObject joFalse = JsonFunctions.valueOfBoolean("propName").apply(false);
- assertEquals(false, joFalse.get("propName").getAsBoolean());
+ Assert.assertEquals(false, joFalse.get("propName").getAsBoolean());
}
@Test
public void testValueOfString() {
JsonObject jo = JsonFunctions.valueOfString("propName").apply("str1");
- assertEquals("str1", jo.get("propName").getAsString());
+ Assert.assertEquals("str1", jo.get("propName").getAsString());
}
@Test
public void testValueOfCharacter() {
JsonObject jo = JsonFunctions.valueOfCharacter("propName").apply('c');
- assertEquals('c', jo.get("propName").getAsCharacter());
+ Assert.assertEquals('c', jo.get("propName").getAsCharacter());
}
}
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java b/api/src/test/java/org/apache/edgent/topology/PlumbingTest.java
similarity index 99%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
rename to api/src/test/java/org/apache/edgent/topology/PlumbingTest.java
index 644ac4f..708f5cb 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/PlumbingTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -36,11 +36,10 @@ import org.apache.edgent.function.BiFunction;
import org.apache.edgent.function.Function;
import org.apache.edgent.function.Functions;
import org.apache.edgent.function.ToIntFunction;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.plumbing.PlumbingStreams;
import org.apache.edgent.topology.plumbing.Valve;
import org.apache.edgent.topology.tester.Condition;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -392,7 +391,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
int cnt = 0;
System.out.println("combiner: "+list);
for(JsonObject jo : list) {
- assertEquals(cnt++, jo.get("channel").getAsInt());
+ Assert.assertEquals(cnt++, jo.get("channel").getAsInt());
sum += jo.get("result").getAsInt();
}
return sum;
@@ -447,7 +446,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
int cnt = 0;
System.out.println("combiner: "+list);
for(JsonObject jo : list) {
- assertEquals(cnt++, jo.get("channel").getAsInt());
+ Assert.assertEquals(cnt++, jo.get("channel").getAsInt());
sum += jo.get("result").getAsInt();
}
return sum;
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/src/test/java/org/apache/edgent/topology/TStreamTest.java
similarity index 99%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
rename to api/src/test/java/org/apache/edgent/topology/TStreamTest.java
index 9fae5ed..f3afb2f 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/TStreamTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -40,10 +40,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.edgent.topology.TSink;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.TWindow;
-import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
import org.junit.Ignore;
import org.junit.Test;
@@ -778,7 +774,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
/*
* It's unclear exactly what this test is supposed to achieve
* (hence unclear how to ensure its achieving it).
- * Is it just trying to verify that a failure in one topology/job
+ * Is it just trying to verify that a failure in one org.apache.edgent.org.apache.edgent.topology/job
* doesn't affect the execution of another?
*
* The way the test is written I'm not sure there's any guarantee
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TWindowTest.java b/api/src/test/java/org/apache/edgent/topology/TWindowTest.java
similarity index 97%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/TWindowTest.java
rename to api/src/test/java/org/apache/edgent/topology/TWindowTest.java
index 3d4e340..dd45fea 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TWindowTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/TWindowTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.apache.edgent.function.Functions.identity;
import static org.apache.edgent.function.Functions.unpartitioned;
@@ -33,9 +33,6 @@ import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.TWindow;
-import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyAbstractTest.java b/api/src/test/java/org/apache/edgent/topology/TopologyAbstractTest.java
similarity index 93%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/TopologyAbstractTest.java
rename to api/src/test/java/org/apache/edgent/topology/TopologyAbstractTest.java
index fd413a9..3c9ced8 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyAbstractTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/TopologyAbstractTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
@@ -27,16 +27,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
-import org.apache.edgent.topology.TopologyProvider;
import org.apache.edgent.topology.tester.Condition;
import org.junit.Before;
import org.junit.Ignore;
import com.google.gson.JsonObject;
-@Ignore("Abstract class proiding generic topology testing.")
+@Ignore("Abstract class proiding generic org.apache.edgent.org.apache.edgent.topology testing.")
public abstract class TopologyAbstractTest implements TopologyTestSetup {
private TopologyProvider topologyProvider;
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyElementTest.java b/api/src/test/java/org/apache/edgent/topology/TopologyElementTest.java
similarity index 83%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/TopologyElementTest.java
rename to api/src/test/java/org/apache/edgent/topology/TopologyElementTest.java
index b66750c..7b390b5 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyElementTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/TopologyElementTest.java
@@ -16,14 +16,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.junit.Assert.assertTrue;
-import org.apache.edgent.topology.TSink;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
-import org.apache.edgent.topology.TopologyElement;
import org.junit.Test;
public class TopologyElementTest {
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java b/api/src/test/java/org/apache/edgent/topology/TopologyTest.java
similarity index 97%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java
rename to api/src/test/java/org/apache/edgent/topology/TopologyTest.java
index 033baa9..4c73456 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java
+++ b/api/src/test/java/org/apache/edgent/topology/TopologyTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -36,8 +36,6 @@ import org.apache.edgent.execution.mbeans.PeriodMXBean;
import org.apache.edgent.execution.services.ControlService;
import org.apache.edgent.execution.services.RuntimeServices;
import org.apache.edgent.function.Supplier;
-import org.apache.edgent.topology.TStream;
-import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTestSetup.java b/api/src/test/java/org/apache/edgent/topology/TopologyTestSetup.java
similarity index 88%
rename from api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTestSetup.java
rename to api/src/test/java/org/apache/edgent/topology/TopologyTestSetup.java
index 59560e9..aad11bb 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTestSetup.java
+++ b/api/src/test/java/org/apache/edgent/topology/TopologyTestSetup.java
@@ -16,12 +16,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.topology;
+package org.apache.edgent.topology;
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
-import org.apache.edgent.topology.Topology;
-import org.apache.edgent.topology.TopologyProvider;
public interface TopologyTestSetup {
diff --git a/api/window/src/test/java/org/apache/edgent/test/window/StateTest.java b/api/src/test/java/org/apache/edgent/window/StateTest.java
similarity index 98%
rename from api/window/src/test/java/org/apache/edgent/test/window/StateTest.java
rename to api/src/test/java/org/apache/edgent/window/StateTest.java
index f324152..8a1bd2f 100644
--- a/api/window/src/test/java/org/apache/edgent/test/window/StateTest.java
+++ b/api/src/test/java/org/apache/edgent/window/StateTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.window;
+package org.apache.edgent.window;
import static org.junit.Assert.assertEquals;
diff --git a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java b/api/src/test/java/org/apache/edgent/window/WindowTest.java
similarity index 99%
rename from api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
rename to api/src/test/java/org/apache/edgent/window/WindowTest.java
index 98f04ea..21a3f3d 100644
--- a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
+++ b/api/src/test/java/org/apache/edgent/window/WindowTest.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.edgent.test.window;
+package org.apache.edgent.window;
import static org.apache.edgent.function.Functions.unpartitioned;
import static org.apache.edgent.window.Policies.alwaysInsert;
diff --git a/api/topology/pom.xml b/api/topology/pom.xml
deleted file mode 100644
index 16d5af9..0000000
--- a/api/topology/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-topology</artifactId>
-
- <name>Apache Edgent (Java 8): API: Topology</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-graph</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/api/window/pom.xml b/api/window/pom.xml
deleted file mode 100644
index 6e5c7ac..0000000
--- a/api/window/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-window</artifactId>
-
- <name>Apache Edgent (Java 8): API: Window</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/apps/iot/src/main/java/org/apache/edgent/apps/iot/IotDevicePubSub.java b/apps/iot/src/main/java/org/apache/edgent/apps/iot/IotDevicePubSub.java
index 075fd89..8538d31 100644
--- a/apps/iot/src/main/java/org/apache/edgent/apps/iot/IotDevicePubSub.java
+++ b/apps/iot/src/main/java/org/apache/edgent/apps/iot/IotDevicePubSub.java
@@ -35,21 +35,21 @@ import com.google.gson.JsonObject;
* This application shares an {@link IotDevice} across multiple running
* jobs. This allows a single connection to a back-end message hub to be shared
* across multiple independent applications, without having to build a single
- * topology.
+ * org.apache.edgent.org.apache.edgent.topology.
* <P>
- * Applications coded to {@link IotDevice} obtain a topology specific
+ * Applications coded to {@link IotDevice} obtain a org.apache.edgent.org.apache.edgent.topology specific
* {@code IotDevice} using {@link #addIotDevice(TopologyElement)}. This returned
* device will route events and commands to/from the actual message hub
* {@code IotDevice} through publish-subscribe.
* <P>
- * An instance of this application is created by first creating a new topology and
+ * An instance of this application is created by first creating a new org.apache.edgent.org.apache.edgent.topology and
* then creating a {@link IotDevice} specific to the desired message hub. Then
* the application is created by calling {@link #createApplication(IotDevice)}
* passing the {@code IotDevice}. <BR>
* Then additional independent applications (topologies) can be created and they
- * create a proxy {@code IotDevice} for their topology using
+ * create a proxy {@code IotDevice} for their org.apache.edgent.org.apache.edgent.topology using
* {@link #addIotDevice(TopologyElement)}. This proxy {@code IotDevice} is then
- * used to send device events and receive device commands in that topology. <BR>
+ * used to send device events and receive device commands in that org.apache.edgent.org.apache.edgent.topology. <BR>
* Once all the topologies have been declared they can be submitted.
* </P>
* <P>
@@ -110,7 +110,7 @@ public class IotDevicePubSub {
}
/**
- * Add a proxy {@code IotDevice} for the topology containing {@code te}.
+ * Add a proxy {@code IotDevice} for the org.apache.edgent.org.apache.edgent.topology containing {@code te}.
* <P>
* Any events sent through the returned device are sent onto the message hub
* device through publish-subscribe. <BR>
diff --git a/apps/runtime/src/main/java/org/apache/edgent/apps/runtime/JobMonitorApp.java b/apps/runtime/src/main/java/org/apache/edgent/apps/runtime/JobMonitorApp.java
index afe9575..dd51552 100644
--- a/apps/runtime/src/main/java/org/apache/edgent/apps/runtime/JobMonitorApp.java
+++ b/apps/runtime/src/main/java/org/apache/edgent/apps/runtime/JobMonitorApp.java
@@ -82,7 +82,7 @@ public class JobMonitorApp {
* Constructs a {@code JobMonitorApp} with the specified name in the
* context of the specified provider.
*
- * @param provider the topology provider
+ * @param provider the org.apache.edgent.org.apache.edgent.topology provider
* @param submitter a {@code DirectSubmitter} which provides required
* services and submits the application
* @param name the application name
@@ -100,7 +100,7 @@ public class JobMonitorApp {
}
/**
- * Submits the application topology.
+ * Submits the application org.apache.edgent.org.apache.edgent.topology.
*
* @return the job.
* @throws InterruptedException if the operation was interrupted
@@ -181,13 +181,13 @@ public class JobMonitorApp {
}
/**
- * Declares the following topology:
+ * Declares the following org.apache.edgent.org.apache.edgent.topology:
* <pre>
* JobEvents source --> Filter (health == unhealthy) --> Restart application
* </pre>
*
- * @param name the topology name
- * @return the application topology
+ * @param name the org.apache.edgent.org.apache.edgent.topology name
+ * @return the application org.apache.edgent.org.apache.edgent.topology
*/
protected Topology declareTopology(String name) {
Topology t = provider.newTopology(name);
@@ -198,7 +198,7 @@ public class JobMonitorApp {
}
/**
- * Populates the following topology:
+ * Populates the following org.apache.edgent.org.apache.edgent.topology:
* <pre>
* JobEvents source --> Filter (health == unhealthy) --> Restart application
* </pre>
diff --git a/connectors/command/src/main/java/org/apache/edgent/connectors/command/CommandStreams.java b/connectors/command/src/main/java/org/apache/edgent/connectors/command/CommandStreams.java
index ad02cac..f3afef9 100644
--- a/connectors/command/src/main/java/org/apache/edgent/connectors/command/CommandStreams.java
+++ b/connectors/command/src/main/java/org/apache/edgent/connectors/command/CommandStreams.java
@@ -52,7 +52,7 @@ public class CommandStreams {
* Sample use:
* <pre>{@code
* ProcessBuilder cmd = new ProcessBuilder(tokenize("sh someShellCmd.sh and args"));
- * TStream<String> stream = CommandStreams.generate(topology, cmd);
+ * TStream<String> stream = CommandStreams.generate(org.apache.edgent.org.apache.edgent.topology, cmd);
* }</pre>
*
* @param cmdString a command string
@@ -79,18 +79,18 @@ public class CommandStreams {
* </P>
* <P>
* This is a convenience function equivalent to
- * {@code topology.generate(endlessCommandReader(cmd))}.
+ * {@code org.apache.edgent.org.apache.edgent.topology.generate(endlessCommandReader(cmd))}.
* </P>
* <P>
* Sample use: create a stream of tuples for the output from a
* continuously running and restartable command:
* <pre>{@code
* ProcessBuilder cmd = new ProcessBuilder("myCommand");
- * TStream<String> cmdOutput = CommandStreams.generate(topology, cmd);
+ * TStream<String> cmdOutput = CommandStreams.generate(org.apache.edgent.org.apache.edgent.topology, cmd);
* cmdOutput.print();
* }</pre>
*
- * @param topology the topology to add the source stream to
+ * @param topology the org.apache.edgent.org.apache.edgent.topology to add the source stream to
* @param cmd the {@link ProcessBuilder} to start the command
* @return the source {@code TStream<String>}
*
@@ -113,7 +113,7 @@ public class CommandStreams {
* </P>
* <P>
* This is a convenience function equivalent to
- * {@code topology.poll(commandReaderList(cmd), period, units)}.
+ * {@code org.apache.edgent.org.apache.edgent.topology.poll(commandReaderList(cmd), period, units)}.
* </P>
* <P>
* Sample use: create a stream of tuples containing the output
@@ -121,11 +121,11 @@ public class CommandStreams {
* <pre>{@code
* ProcessBuilder cmd = new ProcessBuilder("date");
* TStream<List<String>> cmdOutput =
- * CommandStreams.periodicSource(topology, cmd, 2, TimeUnit.SECONDS);
+ * CommandStreams.periodicSource(org.apache.edgent.org.apache.edgent.topology, cmd, 2, TimeUnit.SECONDS);
* cmdOutput.print();
* }</pre>
*
- * @param topology the topology to add the source stream to
+ * @param topology the org.apache.edgent.org.apache.edgent.topology to add the source stream to
* @param cmd the {@link ProcessBuilder} to start the command
* @param period the period to run the command and collect its output
* @param units TimeUnit for {@code period}
@@ -159,7 +159,7 @@ public class CommandStreams {
* <P>
* Sample use: write a stream of tuples to the input of a command:
* <pre>{@code
- * TStream<String> stream = topology.strings("one", "two", "three");
+ * TStream<String> stream = org.apache.edgent.org.apache.edgent.topology.strings("one", "two", "three");
* ProcessBuilder cmd = new ProcessBuilder("cat").redirectOutput(new File("/dev/stdout"));
* CommandStreams.sink(stream, cmd);
* }</pre>
@@ -185,7 +185,7 @@ public class CommandStreams {
* For example:
* <pre><code>
* // ingest the sensor data
- * TStream<MySensorData> stream = topology.generate(new MySensor());
+ * TStream<MySensorData> stream = org.apache.edgent.org.apache.edgent.topology.generate(new MySensor());
*
* // MySensor class
* class MySensor implements Supplier<MySensorData> {
@@ -247,7 +247,7 @@ public class CommandStreams {
* For example:
* <pre><code>
* // ingest the sensor data
- * TStream<MySensorData> stream = topology.periodicSource(new MySensor());
+ * TStream<MySensorData> stream = org.apache.edgent.org.apache.edgent.topology.periodicSource(new MySensor());
*
* // MySensor class
* class MySensor implements Supplier<MySensorData> {
diff --git a/connectors/csv/src/main/java/org/apache/edgent/connectors/csv/Csv.java b/connectors/csv/src/main/java/org/apache/edgent/connectors/csv/Csv.java
index ae1048d..da48a00 100644
--- a/connectors/csv/src/main/java/org/apache/edgent/connectors/csv/Csv.java
+++ b/connectors/csv/src/main/java/org/apache/edgent/connectors/csv/Csv.java
@@ -45,8 +45,8 @@ import com.google.gson.JsonObject;
* // Create a stream of "car" JsonObjects from a "cars.csv" file.
* String fieldNames = new String[]{"year", "make", "model"});
*
- * TStream<String> pathnames = topology.strings("cars.csv");
- * TStream<JsonObject> cars = FileStreams.textFileReader(topology, pathnames)
+ * TStream<String> pathnames = org.apache.edgent.org.apache.edgent.topology.strings("cars.csv");
+ * TStream<JsonObject> cars = FileStreams.textFileReader(org.apache.edgent.org.apache.edgent.topology, pathnames)
* .map(csv -> toJson(parseCsv(csv), fieldNames);
* cars.print();
* }</pre>
diff --git a/connectors/file/src/main/java/org/apache/edgent/connectors/file/FileStreams.java b/connectors/file/src/main/java/org/apache/edgent/connectors/file/FileStreams.java
index 1f4ca5e..9f8b820 100644
--- a/connectors/file/src/main/java/org/apache/edgent/connectors/file/FileStreams.java
+++ b/connectors/file/src/main/java/org/apache/edgent/connectors/file/FileStreams.java
@@ -54,7 +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 te org.apache.edgent.org.apache.edgent.topology element whose org.apache.edgent.org.apache.edgent.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
@@ -96,7 +96,7 @@ public class FileStreams {
* 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 te org.apache.edgent.org.apache.edgent.topology element whose org.apache.edgent.org.apache.edgent.topology the watcher will be added to
* @param directory
* Name of the directory to watch.
* @param comparator
diff --git a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTest.java b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTest.java
index 542a137..202aa69 100644
--- a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTest.java
+++ b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTest.java
@@ -108,7 +108,7 @@ public class FileStreamsTest extends DirectTopologyTestBase {
createFiles(filesWithHidden, repeat);
}
else {
- // Create the files from within the topology.
+ // Create the files from within the org.apache.edgent.org.apache.edgent.topology.
//
// Due to vagaries / delays that can occur in operator startup,
// delay the initial file creation to give the watcher a chance to startup.
diff --git a/connectors/http/src/main/java/org/apache/edgent/connectors/http/HttpStreams.java b/connectors/http/src/main/java/org/apache/edgent/connectors/http/HttpStreams.java
index 97c81a0..f8351fa 100644
--- a/connectors/http/src/main/java/org/apache/edgent/connectors/http/HttpStreams.java
+++ b/connectors/http/src/main/java/org/apache/edgent/connectors/http/HttpStreams.java
@@ -58,14 +58,14 @@ public class HttpStreams {
* <pre>
* {@code
* DirectProvider ep = new DirectProvider();
- * Topology topology = ep.newTopology();
+ * Topology org.apache.edgent.org.apache.edgent.topology = ep.newTopology();
* final String url = "http://httpbin.org/get?";
*
* JsonObject request1 = new JsonObject();
* request1.addProperty("a", "abc");
* request1.addProperty("b", "42");
*
- * TStream<JsonObject> stream = topology.collection(Arrays.asList(request1));
+ * TStream<JsonObject> stream = org.apache.edgent.org.apache.edgent.topology.collection(Arrays.asList(request1));
* TStream<JsonObject> rc = HttpStreams.getJson(stream,
* HttpClients::noAuthentication,
* t -> url + "a=" + t.get("a").getAsString() + "&b="
@@ -103,14 +103,14 @@ public class HttpStreams {
* <pre>
* {@code
* DirectProvider ep = new DirectProvider();
- * Topology topology = ep.newTopology();
+ * Topology org.apache.edgent.org.apache.edgent.topology = ep.newTopology();
* final String url = "http://httpbin.org/delete?";
*
* JsonObject request = new JsonObject();
* request.addProperty("a", "abc");
* request.addProperty("b", "42");
*
- * TStream<JsonObject> stream = topology.collection(Arrays.asList(request));
+ * TStream<JsonObject> stream = org.apache.edgent.org.apache.edgent.topology.collection(Arrays.asList(request));
* TStream<JsonObject> rc = HttpStreams.deleteJson(stream,
* HttpClients::noAuthentication,
* t -> url + "a=" + t.get("a").getAsString() + "&b="
@@ -149,14 +149,14 @@ public class HttpStreams {
* <pre>
* {@code
* DirectProvider ep = new DirectProvider();
- * Topology topology = ep.newTopology();
+ * Topology org.apache.edgent.org.apache.edgent.topology = ep.newTopology();
* final String url = "http://httpbin.org/post";
*
* JsonObject body = new JsonObject();
* body.addProperty("foo", "abc");
* body.addProperty("bar", 42);
*
- * TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
+ * TStream<JsonObject> stream = org.apache.edgent.org.apache.edgent.topology.collection(Arrays.asList(body));
* TStream<JsonObject> rc = HttpStreams.postJson(stream,
* HttpClients::noAuthentication, t -> url, t -> t);
* }
@@ -197,14 +197,14 @@ public class HttpStreams {
* <pre>
* {@code
* DirectProvider ep = new DirectProvider();
- * Topology topology = ep.newTopology();
+ * Topology org.apache.edgent.org.apache.edgent.topology = ep.newTopology();
* final String url = "http://httpbin.org/put";
*
* JsonObject body = new JsonObject();
* body.addProperty("foo", "abc");
* body.addProperty("bar", 42);
*
- * TStream<JsonObject> stream = topology.collection(Arrays.asList(body));
+ * TStream<JsonObject> stream = org.apache.edgent.org.apache.edgent.topology.collection(Arrays.asList(body));
* TStream<JsonObject> rc = HttpStreams.putJson(stream,
* HttpClients::noAuthentication, t -> url, t -> t);
* }
diff --git a/connectors/iot/src/main/java/org/apache/edgent/connectors/iot/HeartBeat.java b/connectors/iot/src/main/java/org/apache/edgent/connectors/iot/HeartBeat.java
index 2ff55e6..1a8324f 100644
--- a/connectors/iot/src/main/java/org/apache/edgent/connectors/iot/HeartBeat.java
+++ b/connectors/iot/src/main/java/org/apache/edgent/connectors/iot/HeartBeat.java
@@ -37,7 +37,7 @@ public class HeartBeat {
private HeartBeat() { };
/**
- * Add IoT device heart beat processing to a topology.
+ * Add IoT device heart beat processing to a org.apache.edgent.org.apache.edgent.topology.
* <P>
* An IoTDevice event containing heart beat information
* is periodically published to the specified {@code eventId}.
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpDevice.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpDevice.java
index 621b342..12f11f9 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpDevice.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpDevice.java
@@ -123,7 +123,7 @@ public class IotpDevice implements IotDevice {
* </code>
* </pre>
* <p>
- * Connecting to the server occurs when the topology is submitted for
+ * Connecting to the server occurs when the org.apache.edgent.org.apache.edgent.topology is submitted for
* execution.
* </p>
* <p>
@@ -165,7 +165,7 @@ public class IotpDevice implements IotDevice {
* </code>
* </pre>
* <p>
- * Connecting to the server occurs when the topology is submitted for
+ * Connecting to the server occurs when the org.apache.edgent.org.apache.edgent.topology is submitted for
* execution.
* </p>
* <p>
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGateway.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGateway.java
index 3ed8fad..b4117ea 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGateway.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGateway.java
@@ -105,7 +105,7 @@ public class IotpGateway implements IotGateway {
* </code>
* </pre>
* <p>
- * Connecting to the server occurs when the topology is submitted for
+ * Connecting to the server occurs when the org.apache.edgent.org.apache.edgent.topology is submitted for
* execution.
* </p>
* <p>
@@ -147,7 +147,7 @@ public class IotpGateway implements IotGateway {
* </code>
* </pre>
* <p>
- * Connecting to the server occurs when the topology is submitted for
+ * Connecting to the server occurs when the org.apache.edgent.org.apache.edgent.topology is submitted for
* execution.
* </p>
* <p>
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpConnector.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpConnector.java
index c2abce7..1681e57 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpConnector.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpConnector.java
@@ -132,7 +132,7 @@ public class IotpConnector implements Serializable, AutoCloseable {
} catch (Exception e) {
// throw new RuntimeException(e);
// If the publish throws, a RuntimeException will cause
- // everything to unwind and the app/topology can terminate.
+ // everything to unwind and the app/org.apache.edgent.org.apache.edgent.topology can terminate.
// See the commentary/impl of MqttPublisher.accept().
// See EDGENT-382
logger.error("Unable to publish event for eventId {}", eventId, e);
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpDeviceCommands.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpDeviceCommands.java
index ab1350d..07d3647 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpDeviceCommands.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpDeviceCommands.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import com.ibm.iotf.client.device.Command;
/**
- * An event setup adapter for {@link Topology#events(Consumer) topology.events()}
+ * An event setup adapter for {@link Topology#events(Consumer) org.apache.edgent.org.apache.edgent.topology.events()}
* that submits received WIoTP device commands as stream tuples.
*/
public class IotpDeviceCommands implements Consumer<Consumer<Command>> {
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWCommands.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWCommands.java
index 60d7625..48247aa 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWCommands.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWCommands.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import com.ibm.iotf.client.gateway.Command;
/**
- * An event setup adapter for {@link Topology#events(Consumer) topology.events()}
+ * An event setup adapter for {@link Topology#events(Consumer) org.apache.edgent.org.apache.edgent.topology.events()}
* that submits received WIoTP device commands as stream tuples.
*/
public class IotpGWCommands implements Consumer<Consumer<Command>> {
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWConnector.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWConnector.java
index 8ae5f84..ccefd72 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWConnector.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/runtime/IotpGWConnector.java
@@ -217,7 +217,7 @@ public class IotpGWConnector implements Serializable, AutoCloseable {
// } catch (Exception e) {
// // throw new RuntimeException(e);
// // If the publish throws, a RuntimeException will cause
-// // everything to unwind and the app/topology can terminate.
+// // everything to unwind and the app/org.apache.edgent.org.apache.edgent.topology can terminate.
// // See the commentary/impl of MqttPublisher.accept().
// // See EDGENT-382
// logger.error("Unable to publish event for eventId {}", eventId, e);
diff --git a/connectors/jdbc/src/main/java/org/apache/edgent/connectors/jdbc/JdbcStreams.java b/connectors/jdbc/src/main/java/org/apache/edgent/connectors/jdbc/JdbcStreams.java
index aad6316..3677e8b 100644
--- a/connectors/jdbc/src/main/java/org/apache/edgent/connectors/jdbc/JdbcStreams.java
+++ b/connectors/jdbc/src/main/java/org/apache/edgent/connectors/jdbc/JdbcStreams.java
@@ -122,7 +122,7 @@ import org.apache.edgent.topology.Topology;
* //
* // Delete all the rows from a table
* //
- * TStream<String> beacon = topology.strings("once");
+ * TStream<String> beacon = org.apache.edgent.org.apache.edgent.topology.strings("once");
* mydb.executeStatement(beacon,
* () -> "DELETE FROM persons",
* (tuple,stmt) -> { } // no params to set
@@ -164,7 +164,7 @@ public class JdbcStreams {
* {@code executeStatement()} can result in a JDBC connection getting
* closed and {@code connFn} is subsequently called to reconnect.
*
- * @param topology topology that this connector is for
+ * @param topology org.apache.edgent.org.apache.edgent.topology that this connector is for
* @param dataSourceFn function that yields the {@link DataSource}
* for the database.
* @param connFn function that yields a {@link Connection} from a {@code DataSource}.
diff --git a/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/MqttStreams.java b/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/MqttStreams.java
index 0c9a9d4..c6b35c0 100644
--- a/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/MqttStreams.java
+++ b/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/MqttStreams.java
@@ -104,7 +104,7 @@ public class MqttStreams {
* <p>
* A convenience function.
* Connecting to the server occurs after the
- * topology is submitted for execution.
+ * org.apache.edgent.org.apache.edgent.topology is submitted for execution.
*
* @param topology the connector's associated {@code Topology}.
* @param url URL of MQTT server.
@@ -122,7 +122,7 @@ public class MqttStreams {
* Create a connector with the specified configuration.
* <p>
* Connecting to the server occurs after the
- * topology is submitted for execution.
+ * org.apache.edgent.org.apache.edgent.topology is submitted for execution.
*
* @param topology the Topology to add to
* @param config {@link MqttConfig} supplier.
diff --git a/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/iot/MqttDevice.java b/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/iot/MqttDevice.java
index c038327..9b33d6c 100644
--- a/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/iot/MqttDevice.java
+++ b/connectors/mqtt/src/main/java/org/apache/edgent/connectors/mqtt/iot/MqttDevice.java
@@ -124,7 +124,7 @@ public class MqttDevice implements IotDevice {
* <p>
* All configuration information comes from {@code properties}.
*
- * @param topology topology to add the connector to.
+ * @param topology org.apache.edgent.org.apache.edgent.topology to add the connector to.
* @param properties connector properties.
*/
public MqttDevice(Topology topology, Properties properties) {
@@ -137,7 +137,7 @@ public class MqttDevice implements IotDevice {
* Uses {@code mattConfig} for the base MQTT connector configuration
* and uses {@code properties} only for MQTT Device properties.
*
- * @param topology topology to add the connector to.
+ * @param topology org.apache.edgent.org.apache.edgent.topology to add the connector to.
* @param properties connector properties. Properties beyond those
* noted in the Device properties section above are ignored.
* @param mqttConfig base MQTT configuration. may be null.
diff --git a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
index 4eae1f1..7f28634 100644
--- a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
+++ b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
@@ -535,8 +535,8 @@ public class MqttStreamsTestManual extends ConnectorTestBase {
completeAndValidate(clientId, top, rcvd, mgen, SEC_TIMEOUT, retainedMsg);
- // N.B. the topology should be shutdown at this point but it isn't
- // and this topology will also receive and print the tuples
+ // N.B. the org.apache.edgent.org.apache.edgent.topology should be shutdown at this point but it isn't
+ // and this org.apache.edgent.org.apache.edgent.topology will also receive and print the tuples
// generated by the main portion of the test.
// issue#46
diff --git a/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConfigKeyConstants.java b/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConfigKeyConstants.java
index f35a8fe..5b938b3 100644
--- a/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConfigKeyConstants.java
+++ b/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConfigKeyConstants.java
@@ -75,7 +75,7 @@ public class RabbitmqConfigKeyConstants {
public static final String RABBITMQ_CONFIG_KEY_REQUESTED_HEARTBEAT = "rabbitmq.connection.requestedHeartbeat";
/**
- * config key for specifying whether enable topology recovery or not.
+ * config key for specifying whether enable org.apache.edgent.org.apache.edgent.topology recovery or not.
*/
public static final String RABBITMQ_CONFIG_KEY_TOPOLOGY_RECOVERY_ENABLED = "rabbitmq.connection.topologyRecoveryEnabled";
diff --git a/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConsumer.java b/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConsumer.java
index 4c2e881..1394f66 100644
--- a/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConsumer.java
+++ b/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqConsumer.java
@@ -64,7 +64,7 @@ public class RabbitmqConsumer {
* The full config option please see RabbitMQ java client API Reference :
* < a href="https://rabbitmq.github.io/rabbitmq-java-client/api/current/com/rabbitmq/client/ConnectionFactory.html">ConnectionFactory</>
* </p>
- * @param topology topology to add to
+ * @param topology org.apache.edgent.org.apache.edgent.topology to add to
* @param config RabbitmqProducer configuration information.
*/
public RabbitmqConsumer(Topology topology, Supplier<Map<String, Object>> config) {
diff --git a/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqProducer.java b/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqProducer.java
index 8437285..fe3bdda 100644
--- a/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqProducer.java
+++ b/connectors/rabbitmq/src/main/java/org/apache/edgent/connectors/rabbitmq/RabbitmqProducer.java
@@ -65,7 +65,7 @@ public class RabbitmqProducer {
* The full config option please see RabbitMQ java client API Reference :
* < a href="https://rabbitmq.github.io/rabbitmq-java-client/api/current/com/rabbitmq/client/ConnectionFactory.html">ConnectionFactory</>
* </p>
- * @param topology topology to add to
+ * @param topology org.apache.edgent.org.apache.edgent.topology to add to
* @param config RabbitmqProducer configuration information.
*/
public RabbitmqProducer(Topology topology, Supplier<Map<String, Object>> config) {
diff --git a/connectors/websocket/src/main/java/org/apache/edgent/connectors/wsclient/javax/websocket/Jsr356WebSocketClient.java b/connectors/websocket/src/main/java/org/apache/edgent/connectors/wsclient/javax/websocket/Jsr356WebSocketClient.java
index f2a8660..dc31676 100644
--- a/connectors/websocket/src/main/java/org/apache/edgent/connectors/wsclient/javax/websocket/Jsr356WebSocketClient.java
+++ b/connectors/websocket/src/main/java/org/apache/edgent/connectors/wsclient/javax/websocket/Jsr356WebSocketClient.java
@@ -111,7 +111,7 @@ public class Jsr356WebSocketClient implements WebSocketClient{
* <li>ws.keyCertificateAlias - alias for certificate in key store. defaults to "default"</li>
* </ul>
* Additional keys in {@code config} are ignored.
- * @param t the topology to add the connector to
+ * @param t the org.apache.edgent.org.apache.edgent.topology to add the connector to
* @param config the connector's configuration
*/
public Jsr356WebSocketClient(Topology t, Properties config) {
@@ -125,12 +125,12 @@ public class Jsr356WebSocketClient implements WebSocketClient{
* by {@link Jsr356WebSocketClient#Jsr356WebSocketClient(Topology, Properties)}
* lacks the configuration needed for a particular use case.
* <p>
- * At topology runtime {@code containerFn.get()} will be called to
+ * At org.apache.edgent.org.apache.edgent.topology runtime {@code containerFn.get()} will be called to
* get a {@code javax.websocket.WebSocketContainer} that will be used to
* connect to the WebSocket server.
* <p>
* Only the "ws.uri" {@code config} parameter is used.
- * @param t the topology to add the connector to
+ * @param t the org.apache.edgent.org.apache.edgent.topology to add the connector to
* @param config the connector's configuration
* @param containerFn supplier for a {@code WebSocketContainer}. May be null.
*/
diff --git a/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java b/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
index 94bc913..cbcd870 100644
--- a/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
+++ b/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
@@ -44,7 +44,7 @@ public class ConsoleJobServlet extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
// jobsInfo to return just the job id, etc
- // jobgraph to return the graph of the job + jobId
+ // jobgraph to return the org.apache.edgent.graph of the job + jobId
Map<String,String[]> parameterMap = request.getParameterMap();
String jobId = "";
boolean jobsInfo = false;
diff --git a/console/servlets/src/main/java/org/apache/edgent/console/servlets/JobUtil.java b/console/servlets/src/main/java/org/apache/edgent/console/servlets/JobUtil.java
index 8cee003..19813bb 100644
--- a/console/servlets/src/main/java/org/apache/edgent/console/servlets/JobUtil.java
+++ b/console/servlets/src/main/java/org/apache/edgent/console/servlets/JobUtil.java
@@ -114,7 +114,7 @@ final class JobUtil {
}
/*
- * Now get the graph for the job
+ * Now get the org.apache.edgent.graph for the job
*/
for (MBeanOperationInfo operationInfo: mBeanInfo.getOperations()) {
if (operationInfo.getName().equals("graphSnapshot")) {
diff --git a/console/servlets/src/main/webapp/js/graph.js b/console/servlets/src/main/webapp/js/graph.js
index 538a892..2b9c93e 100644
--- a/console/servlets/src/main/webapp/js/graph.js
+++ b/console/servlets/src/main/webapp/js/graph.js
@@ -52,7 +52,7 @@ addValuesToEdges = function(graph, counterMetrics) {
var quartile1 = parseInt(max * 0.25, 10);
if (!graph.edgeMap) {
- // fwiw, at this time, graph is new object on every call so these
+ // fwiw, at this time, org.apache.edgent.graph is new object on every call so these
// are rebuilt every time. ugh.
graph.edgeMap = makeEdgeMap(edges); // edgeKey(edge) -> edge; {incoming,outgoing}EdgesKey(opId) -> edges[]
graph.vertexMap = makeVertexMap(vertices); // id -> vertex
@@ -174,7 +174,7 @@ function makeEquivMetricEdgeMap(graph, counterMetrics) {
// Traverses through non-counter-metric peek ops.
// Also includes a FanOut oplet's outputs when traversing downstream
// because the runtime doesn't add CounterOps to them.
-// requires graph.edgeMap, graph.vertexMap
+// requires org.apache.edgent.graph.edgeMap, org.apache.edgent.graph.vertexMap
function collectEquivMetricEdges(graph, edge, isDownstream) {
var equivEdges = [];
var vertex = graph.vertexMap[isDownstream ? edge.targetId : edge.sourceId];
@@ -194,7 +194,7 @@ function collectEquivMetricEdges(graph, edge, isDownstream) {
}
// set the metricEdge's value in all edges equivalent to it.
-// requires graph.equivMetricEdgeMap
+// requires org.apache.edgent.graph.equivMetricEdgeMap
function setEquivalentMetricEdges(graph, metricEdge) {
var edges = graph.equivMetricEdgeMap[edgeKey(metricEdge)];
edges.forEach(function(edge){
diff --git a/console/servlets/src/main/webapp/js/index.js b/console/servlets/src/main/webapp/js/index.js
index 949d202..03f764b 100644
--- a/console/servlets/src/main/webapp/js/index.js
+++ b/console/servlets/src/main/webapp/js/index.js
@@ -138,16 +138,16 @@ d3.select("#toggleTimer")
.on("click", function() {
if (stopTimer === false){
stopTimer = true;
- d3.select(this).text("Resume graph");
+ d3.select(this).text("Resume org.apache.edgent.graph");
d3.select(this)
.attr("class", "start")
- .attr("title", "Resume graph")
+ .attr("title", "Resume org.apache.edgent.graph")
} else {
stopTimer = false;
- d3.select(this).text("Pause graph");
+ d3.select(this).text("Pause org.apache.edgent.graph");
d3.select(this)
.attr("class", "stop")
- .attr("title", "Pause graph");
+ .attr("title", "Pause org.apache.edgent.graph");
}
});
@@ -1043,7 +1043,7 @@ var renderGraph = function(jobId, counterMetrics, bIsNewJob) {
graph = addValuesToEdges(graph, counterMetrics);
}
- // these are used if the topology has no metrics, and to display the static graph
+ // these are used if the org.apache.edgent.org.apache.edgent.topology has no metrics, and to display the static org.apache.edgent.graph
var generatedFlowValues = makeStaticFlowValues(graph.edges.length);
d3.select("#chart").selectAll("*").remove();
@@ -1088,7 +1088,7 @@ var renderGraph = function(jobId, counterMetrics, bIsNewJob) {
showTagDiv(bIsNewJob);
selectedTags = [];
if (d3.select("#showTags").property("checked") === true) {
- // fetch the selected tags, and modify the graph
+ // fetch the selected tags, and modify the org.apache.edgent.graph
selectedTags = getSelectedTags();
}
@@ -1568,7 +1568,7 @@ var fetchJobsInfo = function() {
if (jobObjs.length === 0) {
//no jobs were found, put an entry in the select
- // To Do: if the graph is real, remove it ...
+ // To Do: if the org.apache.edgent.graph is real, remove it ...
jobSelect
.append("option")
.text("No jobs were found")
diff --git a/console/servlets/src/main/webapp/js/streamtags.js b/console/servlets/src/main/webapp/js/streamtags.js
index e9a2035..0093f26 100644
--- a/console/servlets/src/main/webapp/js/streamtags.js
+++ b/console/servlets/src/main/webapp/js/streamtags.js
@@ -70,7 +70,7 @@ d3.select("#showTags")
showAllTags.on("change", function() {
if (this.checked === true) {
selectTagButton.property("disabled", true);
- // render the graph with all the tags shown
+ // render the org.apache.edgent.graph with all the tags shown
} else {
// enable it
selectTagButton.property("disabled", false);
diff --git a/edgent_overview.html b/edgent_overview.html
index 2207101..c9ba776 100644
--- a/edgent_overview.html
+++ b/edgent_overview.html
@@ -92,10 +92,10 @@ For example, you could analyze the last 90 seconds of data from a sensor to iden
<P>
<H3>Topology functional API</H3>
<H4>Overview</H4>
-The primary api is {@link org.apache.edgent.topology.Topology} which uses a functional
-model to build a topology of {@link org.apache.edgent.topology.TStream streams} for an application.
+The primary api is {@link Topology} which uses a functional
+model to build a topology of {@link TStream streams} for an application.
<BR>
-{@link org.apache.edgent.topology.TStream TStream} is a declaration of a stream of tuples, an application will create streams that source data (e.g. sensor readings) and then apply functions that transform those streams into derived streams, for example simply filtering a stream containg engine temperator readings to a derived stream that only contains readings thar are greater than 100°C.
+{@link TStream TStream} is a declaration of a stream of tuples, an application will create streams that source data (e.g. sensor readings) and then apply functions that transform those streams into derived streams, for example simply filtering a stream containg engine temperator readings to a derived stream that only contains readings thar are greater than 100°C.
<BR>
An application terminates processing for a stream by <em>sinking</em> it. Sinking effectively terminates a stream by applying processing to each tuple on the stream (as it occurs) that does not produce a result. Typically this sinking is transmitting the tuple to an external system, for example the messgae hub to send the data to a back-end system, or locally sending the data to a user interface.
</P>
@@ -119,7 +119,7 @@ However Edgent allows arbitrary topologies including:
</UL>
<H3>Graph API</H3>
<H4>Overview</H4>
-The {@link org.apache.edgent.graph.Graph graph} API is a lower-level API that the
+The {@link Graph graph} API is a lower-level API that the
topology api is built on top of. A graph consists of
{@link org.apache.edgent.oplet.Oplet oplet} invocations connected by streams.
The oplet invocations contain the processing applied to each tuple
diff --git a/platforms/android/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java b/platforms/android/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
index 687bac1..6386d62 100644
--- a/platforms/android/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
+++ b/platforms/android/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
@@ -38,7 +38,7 @@ public class SensorStreams {
* Each sensor event will result in a tuple on
* the returned stream.
*
- * @param te Topology element for stream's topology
+ * @param te Topology element for stream's org.apache.edgent.org.apache.edgent.topology
* @param sensorManager Sensor manager
* @param sensorTypes Which sensors to listen for.
* @return Stream that will contain events from the sensors.
@@ -59,7 +59,7 @@ public class SensorStreams {
* Each sensor event will result in a tuple on
* the returned stream.
*
- * @param te Topology element for stream's topology
+ * @param te Topology element for stream's org.apache.edgent.org.apache.edgent.topology
* @param sensorManager Sensor manager
* @param sensors Which sensors to listen for.
* @return Stream that will contain events from the sensors.
diff --git a/pom.xml b/pom.xml
index 1dd01f0..7c60496 100644
--- a/pom.xml
+++ b/pom.xml
@@ -785,7 +785,7 @@
<group>
<title>Edgent API</title>
<packages>
- org.apache.edgent.execution:org.apache.edgent.function:org.apache.edgent.topology:org.apache.edgent.topology.json:org.apache.edgent.topology.mbeans:org.apache.edgent.topology.plumbing:org.apache.edgent.topology.services:org.apache.edgent.execution.*
+ org.apache.edgent.execution:org.apache.edgent.function:org.apache.edgent.topology:org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.json:org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.mbeans:org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.plumbing:org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.services:org.apache.edgent.execution.*
</packages>
</group>
<group>
@@ -804,17 +804,17 @@
</group>
<group>
<title>Edgent Tester</title>
- <packages>org.apache.edgent.topology.tester:org.apache.edgent.topology.tester.*</packages>
+ <packages>org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.tester:org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.tester.*</packages>
</group>
<group>
<title>Edgent Low-Level API</title>
<packages>
- org.apache.edgent.graph:org.apache.edgent.graph.*:org.apache.edgent.oplet:org.apache.edgent.oplet.*:org.apache.edgent.window
+ org.apache.edgent.graph:org.apache.edgent.org.apache.edgent.graph.*:org.apache.edgent.oplet:org.apache.edgent.oplet.*:org.apache.edgent.window
</packages>
</group>
<group>
<title>Edgent SPI</title>
- <packages>org.apache.edgent.topology.spi:org.apache.edgent.topology.spi.*</packages>
+ <packages>org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.spi:org.apache.edgent.org.apache.edgent.org.apache.edgent.topology.spi.*</packages>
</group>
<!-- everything else is automatically added to a "Other Packages" group -->
</groups>
diff --git a/providers/development/src/main/java/org/apache/edgent/providers/development/DevelopmentProvider.java b/providers/development/src/main/java/org/apache/edgent/providers/development/DevelopmentProvider.java
index e84f17b..e2df23f 100644
--- a/providers/development/src/main/java/org/apache/edgent/providers/development/DevelopmentProvider.java
+++ b/providers/development/src/main/java/org/apache/edgent/providers/development/DevelopmentProvider.java
@@ -59,13 +59,13 @@ import com.google.gson.JsonObject;
* beans in the platform MBean server.
* </LI>
* <LI>
- * Add tuple count metrics on all the streams before submitting a topology.
+ * Add tuple count metrics on all the streams before submitting a org.apache.edgent.org.apache.edgent.topology.
* The implementation calls {@link Metrics#counter(Topology)} to insert
* {@link CounterOp} oplets into each stream.
* </LI>
* <LI>
- * Instrument the topology adding {@link org.apache.edgent.streamscope.oplets.StreamScope StreamScope}
- * oplets on all the streams before submitting a topology.
+ * Instrument the org.apache.edgent.org.apache.edgent.topology adding {@link org.apache.edgent.streamscope.oplets.StreamScope StreamScope}
+ * oplets on all the streams before submitting a org.apache.edgent.org.apache.edgent.topology.
* See {@link StreamScopeSetup#addStreamScopes(Topology) StreamScopeSetup.addStreamscopes}.
* </LI>
* <LI>
diff --git a/providers/development/src/main/java/org/apache/edgent/providers/development/package-info.java b/providers/development/src/main/java/org/apache/edgent/providers/development/package-info.java
index c16b40e..cd24006 100644
--- a/providers/development/src/main/java/org/apache/edgent/providers/development/package-info.java
+++ b/providers/development/src/main/java/org/apache/edgent/providers/development/package-info.java
@@ -18,7 +18,7 @@ under the License.
*/
/**
- * Execution of a streaming topology in a development environment .
+ * Execution of a streaming org.apache.edgent.org.apache.edgent.topology in a development environment .
*/
package org.apache.edgent.providers.development;
diff --git a/providers/development/src/test/java/org/apache/edgent/test/providers/dev/DevelopmentProviderTest.java b/providers/development/src/test/java/org/apache/edgent/test/providers/dev/DevelopmentProviderTest.java
index ef83171..36edc7c 100644
--- a/providers/development/src/test/java/org/apache/edgent/test/providers/dev/DevelopmentProviderTest.java
+++ b/providers/development/src/test/java/org/apache/edgent/test/providers/dev/DevelopmentProviderTest.java
@@ -54,7 +54,7 @@ public class DevelopmentProviderTest extends TopologyAbstractTest {
return (DevelopmentProvider) getTopologyProvider();
}
- // DevelopmentProvider inserts CounterOp metric oplets into the graph
+ // DevelopmentProvider inserts CounterOp metric oplets into the org.apache.edgent.graph
@Test
public void testMetricsEverywhere() throws Exception {
@@ -88,7 +88,7 @@ public class DevelopmentProviderTest extends TopologyAbstractTest {
assertEquals(1, numOplets);
}
- // DevelopmentProvider inserts StreamScope oplets into the graph
+ // DevelopmentProvider inserts StreamScope oplets into the org.apache.edgent.graph
@Test
public void testStreamScopesEverywhere() throws Exception {
diff --git a/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectProvider.java b/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectProvider.java
index 7f6cc05..7ba16c9 100644
--- a/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectProvider.java
+++ b/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectProvider.java
@@ -33,12 +33,12 @@ import com.google.gson.JsonObject;
/**
* {@code DirectProvider} is a {@link TopologyProvider} that
- * runs a submitted topology as a {@link Job} in threads
+ * runs a submitted org.apache.edgent.org.apache.edgent.topology as a {@link Job} in threads
* in the current virtual machine.
* <P>
- * A job (execution of a topology) continues to execute
+ * A job (execution of a org.apache.edgent.org.apache.edgent.topology) continues to execute
* while any of its elements have remaining work,
- * such as any of the topology's source streams are capable
+ * such as any of the org.apache.edgent.org.apache.edgent.topology's source streams are capable
* of generating tuples.
* <BR>
* "Endless" source streams never terminate - e.g., a stream
diff --git a/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectTopology.java b/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectTopology.java
index c7bb758..effbaed 100644
--- a/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectTopology.java
+++ b/providers/direct/src/main/java/org/apache/edgent/providers/direct/DirectTopology.java
@@ -39,7 +39,7 @@ import com.google.gson.JsonObject;
* {@code DirectTopology} is a {@link GraphTopology} that
* is executed in threads in the current virtual machine.
* <P>
- * The topology is backed by a {@code DirectGraph} and its
+ * The org.apache.edgent.org.apache.edgent.topology is backed by a {@code DirectGraph} and its
* execution is controlled and monitored by a {@code EtiaoJob}.
* </P>
*/
@@ -52,7 +52,7 @@ public class DirectTopology extends GraphTopology<DirectTester> {
/**
* Creates a {@code DirectTopology} instance.
*
- * @param name topology name
+ * @param name org.apache.edgent.org.apache.edgent.topology name
* @param container container which provides runtime services
*/
DirectTopology(String name, ServiceContainer container) {
diff --git a/providers/direct/src/main/java/org/apache/edgent/providers/direct/package-info.java b/providers/direct/src/main/java/org/apache/edgent/providers/direct/package-info.java
index d46fdde..078c235 100644
--- a/providers/direct/src/main/java/org/apache/edgent/providers/direct/package-info.java
+++ b/providers/direct/src/main/java/org/apache/edgent/providers/direct/package-info.java
@@ -18,7 +18,7 @@ under the License.
*/
/**
- * Direct execution of a streaming topology.
+ * Direct execution of a streaming org.apache.edgent.org.apache.edgent.topology.
*/
package org.apache.edgent.providers.direct;
diff --git a/providers/iot/src/main/java/org/apache/edgent/providers/iot/IotProvider.java b/providers/iot/src/main/java/org/apache/edgent/providers/iot/IotProvider.java
index 6f3017d..93b464d 100644
--- a/providers/iot/src/main/java/org/apache/edgent/providers/iot/IotProvider.java
+++ b/providers/iot/src/main/java/org/apache/edgent/providers/iot/IotProvider.java
@@ -70,14 +70,14 @@ import com.google.gson.JsonObject;
* }
* private void buildApp1(IotDevice iotDevice, JsonConfig cfg) {
* Topology top = iotDevice.getTopology();
- * ... build the topology
+ * ... build the org.apache.edgent.org.apache.edgent.topology
* }
* }
* </code></pre>
*
* <p>The registered builders are subsequently invoked from
* {@link ApplicationServiceMXBean#submit(String, String) ApplicationServiceMXBean.submit()}.
- * Each builder invocation is given a virtual {@code IotDevice} for the topology's use.
+ * Each builder invocation is given a virtual {@code IotDevice} for the org.apache.edgent.org.apache.edgent.topology's use.
* Jobs can be stopped using their {@link JobMXBean} control.
*
* <p>Applications may also be registered via
@@ -118,7 +118,7 @@ import com.google.gson.JsonObject;
* <LI>Access to the control service through device commands from the message hub.</LI>
* </UL>
*
- * <p>If topology builders are registered with the ApplicationService using
+ * <p>If org.apache.edgent.org.apache.edgent.topology builders are registered with the ApplicationService using
* something other than this provider's {@code registerTopology()},
* that code is responsible for creating the virtual IotDevice as described
* above on each builder invocation.
@@ -135,7 +135,7 @@ import com.google.gson.JsonObject;
* }
* private void buildTopology(IotDevice iotDevice, JsonConfig c) {
* Topology t = iotDevice.getTopology();
- * ... build your topology
+ * ... build your org.apache.edgent.org.apache.edgent.topology
* }
* }
* </code></pre>
@@ -191,7 +191,7 @@ public class IotProvider implements TopologyProvider,
* Create an {@code IotProvider} that uses the passed in {@code DirectProvider}.
*
* @param name Name of the provider, if the value is not {@code null} then a preferences service is created.
- * @param provider {@code DirectProvider} to use for topology creation and submission.
+ * @param provider {@code DirectProvider} to use for org.apache.edgent.org.apache.edgent.topology creation and submission.
* @param iotDeviceCreator How the {@code IotDevice} is created.
*
* @see DirectProvider
@@ -426,7 +426,7 @@ public class IotProvider implements TopologyProvider,
* Same as {@link #registerTopology(String, BiConsumer, boolean, JsonObject) registerTopology(appName, builder, false, null)}.
*
* @param applicationName Application name
- * @param builder Function that builds the topology.
+ * @param builder Function that builds the org.apache.edgent.org.apache.edgent.topology.
*/
public void registerTopology(String applicationName, BiConsumer<IotDevice, JsonObject> builder) {
registerTopology(applicationName, builder, false, null);
@@ -440,12 +440,12 @@ public class IotProvider implements TopologyProvider,
* function {@code builder} that builds the application. The passed
* in {@code IotDevice} is created using {@link IotDevicePubSub#addIotDevice(org.apache.edgent.topology.TopologyElement)}.
* <BR>
- * Note that {@code builder} obtains a reference to its topology using
+ * Note that {@code builder} obtains a reference to its org.apache.edgent.org.apache.edgent.topology using
* {@link IotDevice#topology()}.
* <P>
* When the application is
* {@link org.apache.edgent.topology.mbeans.ApplicationServiceMXBean#submit(String, String) submitted} {@code builder.accept(iotDevice, config)}
- * is called to build the application's graph.
+ * is called to build the application's org.apache.edgent.graph.
* </P>
* <P>
* Specify {@code autoSubmit==true}, to have the provider submit the application
@@ -453,7 +453,7 @@ public class IotProvider implements TopologyProvider,
* </P>
*
* @param applicationName Application name
- * @param builder Function that builds the topology.
+ * @param builder Function that builds the org.apache.edgent.org.apache.edgent.topology.
* @param autoSubmit auto submit the application when {@link #start()} is called.
* @param config config for auto-submitted application.
* See {@link #submit(Topology, JsonObject) submit}. May be null.
diff --git a/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppService.java b/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppService.java
index e1c91e6..cf451a8 100644
--- a/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppService.java
+++ b/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppService.java
@@ -53,7 +53,7 @@ import com.google.gson.JsonObject;
* <BR>
* Applications {@link #registerTopology(String, BiConsumer) registered}
* can be submitted through the control {@link ApplicationServiceMXBean}
- * registered with the {@link ControlService} for the topology provider.
+ * registered with the {@link ControlService} for the org.apache.edgent.org.apache.edgent.topology provider.
* <BR>
* If a control service is not available then no control MBean is registered
* and the application service is effectively inactive.
@@ -65,7 +65,7 @@ public class AppService implements ApplicationService {
/**
* Create an register an application service using the default alias {@link ApplicationService#ALIAS}.
- * @param provider Provider to create topology instances for registered applications.
+ * @param provider Provider to create org.apache.edgent.org.apache.edgent.topology instances for registered applications.
* @param submitter Submitter for registered applications.
* @return Application service instance.
*/
@@ -87,7 +87,7 @@ public class AppService implements ApplicationService {
/**
* Create an {@code ApplicationService} instance.
- * @param provider Provider to create topology instances for registered applications.
+ * @param provider Provider to create org.apache.edgent.org.apache.edgent.topology instances for registered applications.
* @param submitter Submitter for registered applications.
* @param alias Alias used to register the control MBean.
*/
@@ -116,7 +116,7 @@ public class AppService implements ApplicationService {
/**
* Create a new class loader for the jar and register any
- * topology application that is registered as a service provider.
+ * org.apache.edgent.org.apache.edgent.topology application that is registered as a service provider.
*/
@Override
public void registerJar(String jarURL, String jsonConfig) throws Exception {
diff --git a/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppServiceControl.java b/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppServiceControl.java
index 09b97d5..3ef3748 100644
--- a/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppServiceControl.java
+++ b/runtime/appservice/src/main/java/org/apache/edgent/runtime/appservice/AppServiceControl.java
@@ -55,7 +55,7 @@ public class AppServiceControl implements ApplicationServiceMXBean {
Topology topology = service.getProvider().newTopology(applicationName);
- // Fill in the topology
+ // Fill in the org.apache.edgent.org.apache.edgent.topology
builder.accept(topology, config);
if (!config.has(Configs.JOB_NAME))
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/EtiaoJob.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/EtiaoJob.java
index db57e55..f7ecdeb 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/EtiaoJob.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/EtiaoJob.java
@@ -51,10 +51,10 @@ public class EtiaoJob extends AbstractGraphJob implements JobContext {
/**
* Creates a new {@code EtiaoJob} instance which controls the lifecycle
- * of the specified graph.
+ * of the specified org.apache.edgent.graph.
*
- * @param graph graph representation of the topology
- * @param topologyName name of the topology
+ * @param graph org.apache.edgent.graph representation of the org.apache.edgent.org.apache.edgent.topology
+ * @param topologyName name of the org.apache.edgent.org.apache.edgent.topology
* @param jobName name of the Job. If null, a name of {@code topologyName_jobId} is assigned.
* @param container service container
*/
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
index 46c7de0..eebb584 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
@@ -42,12 +42,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Executes and provides runtime services to the executable graph
+ * Executes and provides runtime services to the executable org.apache.edgent.graph
* elements (oplets and functions).
*/
public class Executable implements RuntimeServices {
- private EtiaoJob job; // instantiated when topology is submitted
+ private EtiaoJob job; // instantiated when org.apache.edgent.org.apache.edgent.topology is submitted
private final ServiceContainer containerServices;
private final ThreadFactory controlThreads;
private final BiConsumer<Object, Throwable> completionHandler;
@@ -74,7 +74,7 @@ public class Executable implements RuntimeServices {
}
/**
- * Creates a new {@code Executable} for the specified topology name, which uses the
+ * Creates a new {@code Executable} for the specified org.apache.edgent.org.apache.edgent.topology name, which uses the
* given thread factory to create new threads for oplet execution.
*
* @param name the name of the executable
@@ -124,7 +124,7 @@ public class Executable implements RuntimeServices {
/**
* Returns the {@code ScheduledExecutorService} used for running
- * executable graph elements.
+ * executable org.apache.edgent.graph elements.
*
* @return the scheduler
*/
@@ -133,7 +133,7 @@ public class Executable implements RuntimeServices {
}
/**
- * Acts as a service provider for executable elements in the graph, first
+ * Acts as a service provider for executable elements in the org.apache.edgent.graph, first
* looking for a service specific to this job, and then one from the
* container.
*/
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/DirectGraph.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/DirectGraph.java
index d5a1b5d..7546224 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/DirectGraph.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/DirectGraph.java
@@ -43,9 +43,9 @@ public class DirectGraph extends AbstractGraph<Executable> {
/**
* Creates a new {@code DirectGraph} instance underlying the specified
- * topology.
+ * org.apache.edgent.org.apache.edgent.topology.
*
- * @param topologyName name of the topology
+ * @param topologyName name of the org.apache.edgent.org.apache.edgent.topology
* @param container service container
*/
public DirectGraph(String topologyName, ServiceContainer container) {
@@ -53,7 +53,7 @@ public class DirectGraph extends AbstractGraph<Executable> {
}
/**
- * Returns the {@code Executable} running this graph.
+ * Returns the {@code Executable} running this org.apache.edgent.graph.
* @return the executable
*/
public Executable executable() {
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/GraphType.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/GraphType.java
index 377df69..4a1ee53 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/GraphType.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/GraphType.java
@@ -28,9 +28,9 @@ import org.apache.edgent.graph.Vertex;
import org.apache.edgent.oplet.Oplet;
/**
- * A generic directed graph of vertices, connectors and edges.
+ * A generic directed org.apache.edgent.graph of vertices, connectors and edges.
* <p>
- * The graph consists of {@link VertexType} objects, each having
+ * The org.apache.edgent.graph consists of {@link VertexType} objects, each having
* 0 or more input and/or output {@link EdgeType} objects.
* {@link EdgeType} objects connect an output connector to
* an input connector.
@@ -39,12 +39,12 @@ import org.apache.edgent.oplet.Oplet;
*/
public class GraphType {
/**
- * List of all vertices in this graph.
+ * List of all vertices in this org.apache.edgent.graph.
*/
private final List<VertexType<?,?>> vertices;
/**
- * List of all edges in this graph.
+ * List of all edges in this org.apache.edgent.graph.
*/
private final List<EdgeType> edges;
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/VertexType.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/VertexType.java
index 492838f..a875cb8 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/VertexType.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/graph/model/VertexType.java
@@ -23,7 +23,7 @@ import org.apache.edgent.oplet.Oplet;
import org.apache.edgent.runtime.etiao.graph.ExecutableVertex;
/**
- * A {@code VertexType} in a graph.
+ * A {@code VertexType} in a org.apache.edgent.graph.
* <p>
* A {@code VertexType} has an {@link InvocationType} instance.
*
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/package-info.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/package-info.java
index 4b2f49b..5912bff 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/package-info.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/package-info.java
@@ -18,14 +18,14 @@ under the License.
*/
/**
- * A runtime for executing an Edgent streaming topology, designed as an embeddable library
+ * A runtime for executing an Edgent streaming org.apache.edgent.org.apache.edgent.topology, designed as an embeddable library
* so that it can be executed in a simple Java application.
*
* <h2>"EveryThing Is An Oplet" (ETIAO)</h2>
*
* The runtime's focus is on executing oplets and their connected streams, where each
* oplet is just a black box. Specifically this means that functionality is added by the introduction
- * of oplets into the graph that were not explicitly declared by the application developer.
+ * of oplets into the org.apache.edgent.graph that were not explicitly declared by the application developer.
* For example, metrics are implemented by oplets, not the runtime. A metric collector is an
* oplet that calculates metrics on tuples accepted on its input port, and them makes them
* available, for example through JMX.
diff --git a/runtime/jobregistry/src/main/java/org/apache/edgent/runtime/jobregistry/JobEvents.java b/runtime/jobregistry/src/main/java/org/apache/edgent/runtime/jobregistry/JobEvents.java
index 8a6bbbf..0dbda44 100644
--- a/runtime/jobregistry/src/main/java/org/apache/edgent/runtime/jobregistry/JobEvents.java
+++ b/runtime/jobregistry/src/main/java/org/apache/edgent/runtime/jobregistry/JobEvents.java
@@ -48,13 +48,13 @@ public class JobEvents {
* {@code wrapper} function to construct a tuple from a job event
* and submits the tuple on the returned stream.</p>
* <p>
- * When the topology's execution is terminated,
+ * When the org.apache.edgent.org.apache.edgent.topology's execution is terminated,
* {@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 topology the stream org.apache.edgent.org.apache.edgent.topology
* @param wrapper constructs a tuple from a job event
* @return new stream containing the tuples generated by the specified {@code wrapper}.
*
diff --git a/spi/topology/src/main/java/org/apache/edgent/topology/spi/AbstractTStream.java b/spi/topology/src/main/java/org/apache/edgent/topology/spi/AbstractTStream.java
index 4697fa6..a19c9e6 100644
--- a/spi/topology/src/main/java/org/apache/edgent/topology/spi/AbstractTStream.java
+++ b/spi/topology/src/main/java/org/apache/edgent/topology/spi/AbstractTStream.java
@@ -40,7 +40,7 @@ import org.apache.edgent.topology.Topology;
* <LI>{@link TStream#sink(org.apache.edgent.function.Consumer)}
* </UL>
* These methods are unimplemented, thus left to the specific implementation
- * used to build the topology.
+ * used to build the org.apache.edgent.org.apache.edgent.topology.
*
* @param <G>
* Type of the {@link Topology} implementation.
diff --git a/spi/topology/src/main/java/org/apache/edgent/topology/spi/graph/ConnectorStream.java b/spi/topology/src/main/java/org/apache/edgent/topology/spi/graph/ConnectorStream.java
index e4cea0f..6b60d4a 100644
--- a/spi/topology/src/main/java/org/apache/edgent/topology/spi/graph/ConnectorStream.java
+++ b/spi/topology/src/main/java/org/apache/edgent/topology/spi/graph/ConnectorStream.java
@@ -63,9 +63,9 @@ import org.apache.edgent.window.Window;
import org.apache.edgent.window.Windows;
/**
- * A stream that directly adds oplets to the graph.
+ * A stream that directly adds oplets to the org.apache.edgent.graph.
*
- * @param <G> topology type
+ * @param <G> org.apache.edgent.org.apache.edgent.topology type
* @param <T> tuple type
*/
public class ConnectorStream<G extends Topology, T> extends AbstractTStream<G, T> {
@@ -229,7 +229,7 @@ public class ConnectorStream<G extends Topology, T> extends AbstractTStream<G, T
// To perform a join, the runtime needs to maintain a windowImpl based on
// the tuples from the twindow.feeder TStream. To do this, it's
// necessary to create an Aggregate oplet and insert it into the
- // graph with lastStream.pipe.
+ // org.apache.edgent.graph with lastStream.pipe.
Aggregate<U,Object,K> op = new Aggregate<U,Object,K>(window, processor);
lastStream.pipe(op);
diff --git a/test/GpsObdAnalyticsApplication.properties b/test/GpsObdAnalyticsApplication.properties
index 10115ab..5e54b4f 100644
--- a/test/GpsObdAnalyticsApplication.properties
+++ b/test/GpsObdAnalyticsApplication.properties
@@ -1,6 +1,6 @@
# Application Configuration properties
#
-# The default topology provider is DirectProvider.
+# The default org.apache.edgent.org.apache.edgent.topology provider is DirectProvider.
topology.provider=org.apache.edgent.providers.development.DevelopmentProvider
#
application.name=GpsAnalyticsApplication
@@ -12,7 +12,7 @@ consoleUrl=yes
# =========================================================================
# Application stream logging configuration
# Where the app puts its stream logs.
-# The directory will be created when the topology
+# The directory will be created when the org.apache.edgent.org.apache.edgent.topology
# runs if it doesn't already exist.
application.log.dir=/tmp/GpsAnalyticsApplication/logs
diff --git a/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceIT.java b/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceIT.java
index efea710..03a40d4 100644
--- a/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceIT.java
+++ b/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceIT.java
@@ -57,7 +57,7 @@ public class IotAppServiceIT {
@Test(expected=ClassNotFoundException.class)
public void testAppsNotInClasspath() throws ClassNotFoundException {
- Class.forName("org.apache.edgent.test.topology.services.TestApplications");
+ Class.forName("org.apache.edgent.test.org.apache.edgent.org.apache.edgent.topology.services.TestApplications");
}
@Test
diff --git a/test/svt/src/main/java/org/apache/edgent/test/svt/TopologyTestBasic.java b/test/svt/src/main/java/org/apache/edgent/test/svt/TopologyTestBasic.java
index 74e0c1f..06ca93a 100644
--- a/test/svt/src/main/java/org/apache/edgent/test/svt/TopologyTestBasic.java
+++ b/test/svt/src/main/java/org/apache/edgent/test/svt/TopologyTestBasic.java
@@ -21,7 +21,7 @@ package org.apache.edgent.test.svt;
import java.io.PrintWriter;
/*
- * Basic topology test to exercise TStream methods.
+ * Basic org.apache.edgent.org.apache.edgent.topology test to exercise TStream methods.
*
* Run from the edgent top-level directory:
* java -cp "test/svt/classes;target/java8/lib/*;target/java8/ext/slf4j-1.7.12/*"
diff --git a/utils/metrics/src/main/java/org/apache/edgent/metrics/Metrics.java b/utils/metrics/src/main/java/org/apache/edgent/metrics/Metrics.java
index ddce8c6..921fb55 100644
--- a/utils/metrics/src/main/java/org/apache/edgent/metrics/Metrics.java
+++ b/utils/metrics/src/main/java/org/apache/edgent/metrics/Metrics.java
@@ -53,9 +53,9 @@ public class Metrics {
}
/**
- * Add counter metrics to all the topology's streams.
+ * Add counter metrics to all the org.apache.edgent.org.apache.edgent.topology's streams.
* <p>
- * {@link CounterOp} oplets are inserted between every two graph
+ * {@link CounterOp} oplets are inserted between every two org.apache.edgent.graph
* vertices with the following exceptions:
* <ul>
* <li>Oplets are only inserted upstream from a FanOut oplet.</li>
@@ -67,9 +67,9 @@ public class Metrics {
* {@code CounterOp} oplet (but they are inserted upstream from one.)</li>
* </ul>
* The implementation is not idempotent: Calling the method twice
- * will insert a new set of metric oplets into the graph.
+ * will insert a new set of metric oplets into the org.apache.edgent.graph.
* @param t
- * The topology
+ * The org.apache.edgent.org.apache.edgent.topology
* @see org.apache.edgent.graph.Graph#peekAll(org.apache.edgent.function.Supplier, org.apache.edgent.function.Predicate) Graph.peekAll()
*/
public static void counter(Topology t) {
diff --git a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java
index b051173..9150f0e 100644
--- a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java
+++ b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java
@@ -69,7 +69,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
*/
@Test
public void automaticMetricCleanup1() throws Exception {
- // Declare topology with custom metric oplet
+ // Declare org.apache.edgent.org.apache.edgent.topology with custom metric oplet
Topology t = newTopology();
AtomicInteger n = new AtomicInteger(0);
TStream<Integer> ints = t.poll(() -> n.incrementAndGet(), 10, TimeUnit.MILLISECONDS);
@@ -95,11 +95,11 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
/*
* Test that Metrics are automatically unregistered after the job is closed
- * in a topology with two oplets registering metrics.
+ * in a org.apache.edgent.org.apache.edgent.topology with two oplets registering metrics.
*/
@Test
public void automaticMetricCleanup2() throws Exception {
- // Declare topology with custom metric oplet
+ // Declare org.apache.edgent.org.apache.edgent.topology with custom metric oplet
Topology t = newTopology();
AtomicInteger n = new AtomicInteger(0);
TStream<Integer> ints = t.poll(() -> n.incrementAndGet(), 10, TimeUnit.MILLISECONDS);
@@ -120,7 +120,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
assertEquals(0, all.size());
}
- // Apply Metrics on all streams, simple graph
+ // Apply Metrics on all streams, simple org.apache.edgent.graph
@Test
public void metricsEverywhereSimple() throws Exception {
@@ -131,7 +131,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
TStream<Integer> d = integers(t, 1, 2, 3);
d.sink(tuple -> System.out.print("."));
- // Insert counter metrics into all the topology streams
+ // Insert counter metrics into all the org.apache.edgent.org.apache.edgent.topology streams
Metrics.counter(t);
printGraph(g);
@@ -143,7 +143,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
assertEquals(2, edges.size());
}
- // Apply Metrics on all streams, graph with split oplet and Metric oplet
+ // Apply Metrics on all streams, org.apache.edgent.graph with split oplet and Metric oplet
// Counter oplets are inserted everywhere except after OP_2 (Counter).
@Test
public void metricsEverywhereSplit() throws Exception {
@@ -178,7 +178,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
splits.get(1).sink(tuple -> System.out.print("#"));
splits.get(2).sink(tuple -> System.out.print("@"));
- // Insert counter metrics into all the topology streams
+ // Insert counter metrics into all the org.apache.edgent.org.apache.edgent.topology streams
Metrics.counter(t);
printGraph(g);
@@ -204,7 +204,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
d.sink(tuple -> System.out.print("."));
d.sink(tuple -> System.out.print("@"));
- // Insert counter metrics into all the topology streams
+ // Insert counter metrics into all the org.apache.edgent.org.apache.edgent.topology streams
Metrics.counter(t);
printGraph(g);
diff --git a/utils/streamscope/src/main/java/org/apache/edgent/streamscope/StreamScopeSetup.java b/utils/streamscope/src/main/java/org/apache/edgent/streamscope/StreamScopeSetup.java
index 32c2057..85bf3f3 100644
--- a/utils/streamscope/src/main/java/org/apache/edgent/streamscope/StreamScopeSetup.java
+++ b/utils/streamscope/src/main/java/org/apache/edgent/streamscope/StreamScopeSetup.java
@@ -174,15 +174,15 @@ public class StreamScopeSetup {
// }
/**
- * Add StreamScope instances to the topology
+ * Add StreamScope instances to the org.apache.edgent.org.apache.edgent.topology
* <P>
- * Instrument the topology by adding StreamScope peekers to the
- * topology's streams. At topology submission time, StreamScopes
- * register themselves with the topology's
+ * Instrument the org.apache.edgent.org.apache.edgent.topology by adding StreamScope peekers to the
+ * org.apache.edgent.org.apache.edgent.topology's streams. At org.apache.edgent.org.apache.edgent.topology submission time, StreamScopes
+ * register themselves with the org.apache.edgent.org.apache.edgent.topology's
* {@link StreamScopeRegistry} runtime service.
* </P>
*
- * @param t the Topology. The operation is a no-op if the topology
+ * @param t the Topology. The operation is a no-op if the org.apache.edgent.org.apache.edgent.topology
* does not have a StreamScopeRegistry service.
* @see #register(ServiceContainer) register
* @see org.apache.edgent.graph.Graph#peekAll(org.apache.edgent.function.Supplier, org.apache.edgent.function.Predicate) Graph.peekAll()
diff --git a/utils/streamscope/src/main/java/org/apache/edgent/streamscope/package-info.java b/utils/streamscope/src/main/java/org/apache/edgent/streamscope/package-info.java
index a1b646c..3495b92 100644
--- a/utils/streamscope/src/main/java/org/apache/edgent/streamscope/package-info.java
+++ b/utils/streamscope/src/main/java/org/apache/edgent/streamscope/package-info.java
@@ -29,7 +29,7 @@ under the License.
* </P><P>
* {@link org.apache.edgent.streamscope.StreamScopeSetup StreamScopeSetup} performs the necessary setup for a
* {@link org.apache.edgent.topology.TopologyProvider TopologyProvider} to use the package,
- * including registration of services and instrumenting a topology with
+ * including registration of services and instrumenting a org.apache.edgent.org.apache.edgent.topology with
* StreamScope instances.
*/
package org.apache.edgent.streamscope;