You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/05/26 19:15:21 UTC
[incubator-streampipes] branch dev updated (4fa6d85 -> 47d7197)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 4fa6d85 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
new dff37c3 [STREAMPIPES-140] Add feature to create adapter documentation, delete UI images from core
new b027c50 Fix errors in documentation generator
new 47d7197 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
The 3 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.
Summary of changes:
.../streampipes/smp/ExtractDocumentationMojo.java | 37 ++++++-----
.../smp/extractor/ControllerFileFinder.java | 10 +--
.../ElementFinder.java} | 20 +++---
.../extractor/ResourceDirectoryElementFinder.java | 72 +++++++++++++++++++++
.../smp/generator/DataJsonGenerator.java | 7 +-
.../generator/PipelineElementGridGenerator.java | 2 +-
.../smp/generator/SidebarConfigGenerator.java | 2 +-
.../org/apache/streampipes/smp/util/Utils.java | 4 ++
ui/src/assets/img/connect/coindesk.png | Bin 17868 -> 0 bytes
ui/src/assets/img/connect/dice.png | Bin 13079 -> 0 bytes
ui/src/assets/img/connect/file.png | Bin 12881 -> 0 bytes
ui/src/assets/img/connect/gdelt.png | Bin 33450 -> 0 bytes
ui/src/assets/img/connect/iexcloud.png | Bin 15675 -> 0 bytes
ui/src/assets/img/connect/influxdb.png | Bin 9982 -> 0 bytes
ui/src/assets/img/connect/kafka.jpg | Bin 12955 -> 0 bytes
ui/src/assets/img/connect/nsw.png | Bin 3016 -> 0 bytes
ui/src/assets/img/connect/opc.png | Bin 5087 -> 0 bytes
ui/src/assets/img/connect/pulsar.png | Bin 22890 -> 0 bytes
ui/src/assets/img/connect/rest.png | Bin 17467 -> 0 bytes
ui/src/assets/img/connect/slack.png | Bin 17473 -> 0 bytes
ui/src/assets/img/connect/sql.png | Bin 99909 -> 0 bytes
ui/src/assets/img/connect/wikipedia.png | Bin 65221 -> 0 bytes
22 files changed, 114 insertions(+), 40 deletions(-)
copy streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/{generator/OutputGenerator.java => extractor/ElementFinder.java} (68%)
create mode 100644 streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
delete mode 100644 ui/src/assets/img/connect/coindesk.png
delete mode 100644 ui/src/assets/img/connect/dice.png
delete mode 100644 ui/src/assets/img/connect/file.png
delete mode 100644 ui/src/assets/img/connect/gdelt.png
delete mode 100644 ui/src/assets/img/connect/iexcloud.png
delete mode 100644 ui/src/assets/img/connect/influxdb.png
delete mode 100644 ui/src/assets/img/connect/kafka.jpg
delete mode 100644 ui/src/assets/img/connect/nsw.png
delete mode 100644 ui/src/assets/img/connect/opc.png
delete mode 100644 ui/src/assets/img/connect/pulsar.png
delete mode 100644 ui/src/assets/img/connect/rest.png
delete mode 100644 ui/src/assets/img/connect/slack.png
delete mode 100644 ui/src/assets/img/connect/sql.png
delete mode 100644 ui/src/assets/img/connect/wikipedia.png
[incubator-streampipes] 03/03: Merge branch 'dev' of
github.com:apache/incubator-streampipes into dev
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 47d71970029c795677bf929ea4661ecace679be5
Merge: b027c50 4fa6d85
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue May 26 21:14:55 2020 +0200
Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
.github/workflows/build.yml | 1 +
.../backend/StreamPipesResourceConfig.java | 11 +
.../model/dashboard/DashboardWidgetModel.java | 3 +
.../DataExplorerWidgetModel.java} | 55 +--
.../model/datalake/DataLakeMeasure.java | 25 +-
.../rest/api/dataexplorer/IDataExplorerWidget.java | 30 +-
...shboard.java => AbstractDashboardResource.java} | 8 +-
.../streampipes/rest/impl/dashboard/Dashboard.java | 90 +---
.../rest/impl/datalake/DataLakeDashboard.java | 31 ++
.../rest/impl/datalake/DataLakeManagementV3.java | 101 ++++-
.../rest/impl/datalake/DataLakeResourceV3.java | 55 ++-
.../rest/impl/datalake/DataLakeWidgetResource.java | 89 ++++
.../jsonld/CustomAnnotationProvider.java | 20 +-
.../serializers/jsonld/JsonLdTransformer.java | 4 +-
.../storage/api/IDataExplorerWidgetStorage.java | 30 +-
.../streampipes/storage/api/INoSqlStorage.java | 4 +
.../storage/couchdb/CouchDbStorageManager.java | 10 +
.../impl/DataExplorerDashboardStorageImpl.java | 58 +++
.../impl/DataExplorerWidgetStorageImpl.java | 61 +++
.../streampipes/storage/couchdb/utils/Utils.java | 14 +
.../apache/streampipes/vocabulary/StreamPipes.java | 8 +
.../wrapper/siddhi/engine/SiddhiEventEngine.java | 16 +-
ui/deployment/dev/config.yml | 3 +-
ui/deployment/modules.yml | 15 +
ui/package.json | 12 +-
.../app/CustomMaterial/custom-material.module.ts | 56 +--
.../app-image-labeling.component.css} | 9 +-
.../app-image-labeling.component.html | 35 ++
.../app-image-labeling.component.ts | 54 +++
.../app-image-labeling.module.ts} | 34 +-
.../app/app-overview/app-overview.component.html | 2 +
ui/src/app/app-overview/app-overview.component.ts | 21 +-
ui/src/app/app-overview/app-overview.module.ts | 26 +-
.../app/connect/model/UnnamedStreamPipesEntity.ts | 15 +-
.../coco/Annotation.ts} | 35 +-
.../coco/Category.ts} | 20 +-
.../coco/Coco.format.ts} | 34 +-
.../coco/Image.ts} | 13 +-
ui/src/app/core-model/dashboard/DashboardWidget.ts | 14 +-
.../DataExplorerWidgetModel.ts} | 40 +-
.../datalake/DataLakeMeasure.ts} | 28 +-
ui/src/app/core-model/datalake/DataResult.ts | 4 +-
.../datalake/DateRange.ts} | 29 +-
.../datalake/datalake-rest.service.ts | 97 +++-
.../shared/shared-dashboard.service.ts | 52 +++
ui/src/app/core-ui/core-ui.module.ts | 70 ++-
.../image-annotations.component.css} | 18 +-
.../image-annotations.component.html | 44 ++
.../image-annotations.component.ts | 63 +++
.../components/image-bar/image-bar.component.css} | 7 +-
.../components/image-bar/image-bar.component.html} | 20 +-
.../components/image-bar/image-bar.component.ts | 83 ++++
.../image-container/image-container.component.css} | 9 +-
.../image-container.component.html} | 12 +-
.../image-container/image-container.component.ts | 278 ++++++++++++
.../image-labels/image-labels.component.css} | 18 +-
.../image-labels/image-labels.component.html | 39 ++
.../image-labels/image-labels.component.ts | 73 +++
.../image-categorize.component.css} | 8 +-
.../image-categorize.component.html | 59 +++
.../image-categorize/image-categorize.component.ts | 170 +++++++
.../image-labeling/image-labeling.component.css} | 8 +-
.../image-labeling/image-labeling.component.html | 75 ++++
.../image-labeling/image-labeling.component.ts | 363 +++++++++++++++
.../image-viewer/image-viewer.component.css} | 8 +-
.../image/image-viewer/image-viewer.component.html | 39 ++
.../image/image-viewer/image-viewer.component.ts | 130 ++++++
.../image.component.css} | 8 +-
.../image.component.html} | 20 +-
.../image.component.ts} | 26 +-
.../model/coordinates.ts} | 12 +-
.../model/labeling-mode.ts} | 14 +-
.../image/services/BrushLabeling.service.ts | 155 +++++++
.../core-ui/image/services/CocoFormat.service.ts | 112 +++++
.../core-ui/image/services/LabelingMode.service.ts | 79 ++++
.../image/services/PolygonLabeling.service.ts | 267 +++++++++++
.../image/services/ReactLabeling.service.ts | 211 +++++++++
.../image/services/color.service.ts} | 34 +-
.../util/color.util.ts} | 26 +-
.../core-ui/image/util/imageTranslation.util.ts | 56 +--
.../classification/imageClassification.ts} | 49 +-
.../label-selection/label-selection.component.html | 5 +-
.../point-selection-info.component.html | 6 +-
.../add-visualization-dialog.component.ts | 76 ++--
ui/src/app/dashboard/models/dashboard.model.ts | 1 +
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 6 +-
.../datadownloadDialog/dataDownload.dialog.ts | 124 ++---
.../data-explorer-dashboard-grid.component.css} | 16 +-
.../data-explorer-dashboard-grid.component.html | 36 ++
.../grid/data-explorer-dashboard-grid.component.ts | 107 +++++
...data-explorer-dashboard-overview.component.css} | 10 +-
...data-explorer-dashboard-overview.component.html | 99 ++++
.../data-explorer-dashboard-overview.component.ts | 88 ++++
.../data-explorer-dashboard-panel.component.css} | 16 +-
.../data-explorer-dashboard-panel.component.html | 38 ++
.../data-explorer-dashboard-panel.component.ts | 145 ++++++
.../time-selector/timeRangeSelector.component.css} | 14 +-
.../time-selector/timeRangeSelector.component.html | 51 +++
.../time-selector/timeRangeSelector.component.ts | 74 +++
.../data-explorer-dashboard-widget.component.css} | 38 +-
.../data-explorer-dashboard-widget.component.html | 58 +++
.../data-explorer-dashboard-widget.component.ts | 91 ++++
.../components/widgets/base/base-config.ts} | 11 +-
.../widgets/base/base-data-explorer-widget.ts | 142 ++++++
.../widgets/base/base-ngx-charts-widget.ts | 75 ++++
.../components/widgets/image/image-config.ts | 42 ++
.../widgets/image/image-widget.component.css} | 22 +-
.../widgets/image/image-widget.component.html | 44 ++
.../widgets/image/image-widget.component.ts | 84 ++++
.../widgets/line-chart/line-chart-config.ts | 41 ++
.../line-chart/line-chart-widget.component.css} | 21 +-
.../line-chart/line-chart-widget.component.html | 59 +++
.../line-chart/line-chart-widget.component.ts | 498 +++++++++++++++++++++
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 88 ++--
.../base/baseVisualisation.component.ts} | 55 +--
.../linechart/lineChart.component.css | 0
.../linechart/lineChart.component.html | 0
.../linechart/lineChart.component.ts | 184 ++++++--
.../table/table.component.css | 0
.../table/table.component.html | 0
.../table/table.component.ts | 30 +-
.../old-explorer.component.html} | 4 +-
.../old-explorer-widget/old-explorer.component.ts} | 175 ++++----
.../widgets/old-explorer-widget/old-explorer.css} | 0
.../components/widgets/table/table-config.ts | 42 ++
.../widgets/table/table-widget.component.css} | 22 +-
.../widgets/table/table-widget.component.html | 63 +++
.../widgets/table/table-widget.component.ts | 106 +++++
.../load-data-spinner.component.css} | 6 -
.../load-data-spinner.component.html} | 18 +-
.../load-data-spinner.component.ts} | 20 +-
.../no-data/no-data-in-date-range.component.css} | 6 -
.../no-data/no-data-in-date-range.component.html} | 20 +-
.../no-data/no-data-in-date-range.component.ts} | 31 +-
.../select-properties.component.css} | 6 -
.../select-properties.component.html} | 16 +-
.../select-properties.component.ts | 44 +-
.../data-explorer-v2.component.css} | 15 +-
.../data-explorer-v2.component.html | 56 +++
.../data-explorer-v2/data-explorer-v2.component.ts | 96 ++++
.../data-explorer-v2/data-explorer-v2.module.ts | 167 +++++++
...xplorer-add-visualization-dialog.component.css} | 15 +-
...xplorer-add-visualization-dialog.component.html | 83 ++++
...-explorer-add-visualization-dialog.component.ts | 162 +++++++
...a-explorer-edit-data-view-dialog.component.css} | 15 +-
...a-explorer-edit-data-view-dialog.component.html | 55 +++
...ata-explorer-edit-data-view-dialog.component.ts | 58 +++
.../models/dataview-dashboard.model.ts} | 13 +-
.../models/multi-series.model.ts} | 13 +-
.../registry/data-explorer-widget-registry.ts | 44 ++
.../registry/widget-config-builder.ts | 121 +++++
.../sdk/collected-schema-requirements.ts | 35 +-
ui/src/app/data-explorer-v2/sdk/ep-requirements.ts | 68 +++
.../sdk/extractor/static-property-extractor.ts | 78 ++++
.../sdk/matching/datatype-match.ts | 49 +-
.../sdk/matching/domain-property-match.ts} | 17 +-
.../sdk/matching/mapping-property-generator.ts | 39 +-
.../sdk/matching/primitive-property-match.ts} | 27 +-
.../sdk/matching/property-match.ts} | 26 +-
.../app/data-explorer-v2/sdk/model/datatypes.ts | 37 +-
.../sdk/model/vocabulary.ts} | 12 +-
.../sdk/schema-requirements-builder.ts | 69 +++
.../services/data-lake.service.ts} | 15 +-
.../services/data-view-data-explorer.service.ts | 129 ++++++
.../services/refresh-dashboard.service.ts} | 17 +-
.../services/resize.service.ts} | 18 +-
.../app/data-explorer/data-explorer.component.html | 5 +-
.../app/data-explorer/data-explorer.component.ts | 35 +-
ui/src/app/data-explorer/data-explorer.module.ts | 17 +-
.../datadownloadDialog/dataDownload.dialog.css | 0
.../datadownloadDialog/dataDownload.dialog.html | 0
.../datadownloadDialog/dataDownload.dialog.ts | 0
.../base/baseVisualisation.component.ts} | 53 +--
.../linechart/lineChart.component.css | 0
.../linechart/lineChart.component.html | 8 +-
.../linechart/lineChart.component.ts | 200 +++++++++
.../table/table.component.css | 0
.../table/table.component.html | 0
.../table/table.component.ts | 30 +-
.../explorer.component.html | 0
.../explorer.component.ts | 169 +++----
.../{explorer => explorer-widget}/explorer.css | 0
.../time-selector/timeRangeSelector.component.css} | 6 -
.../time-selector/timeRangeSelector.component.html | 45 ++
.../time-selector/timeRangeSelector.component.ts} | 32 +-
.../platform-services/tsonld-serializer.service.ts | 14 +-
ui/src/app/platform-services/tsonld/tsonld.ts | 13 +
190 files changed, 7902 insertions(+), 1383 deletions(-)
[incubator-streampipes] 02/03: Fix errors in documentation generator
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit b027c50847726304e884ed435601dd5826b19523
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue May 26 21:14:51 2020 +0200
Fix errors in documentation generator
---
.../org/apache/streampipes/smp/ExtractDocumentationMojo.java | 10 ++--------
.../smp/generator/PipelineElementGridGenerator.java | 2 +-
.../streampipes/smp/generator/SidebarConfigGenerator.java | 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
index 46f2489..3d095db 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
@@ -122,7 +122,7 @@ public class ExtractDocumentationMojo extends AbstractMojo {
for (AssetModel assetModel : documentedPipelineElements) {
Path docsPath = Paths.get(targetDir, DOCS_ROOT_FOLDER, DOCS_FOLDER,
- assetModel.getAppId());
+ "pe");
Path docsWebsitePath = Paths.get(targetDir, DOCS_ROOT_FOLDER, DOCS_WEBSITE_FOLDER,
assetModel.getAppId());
Path imgPath = Paths.get(targetDir, DOCS_ROOT_FOLDER, IMG_FOLDER,
@@ -157,15 +157,9 @@ public class ExtractDocumentationMojo extends AbstractMojo {
documentationFileContents = new ImagePathReplacer(documentationFileContents,
assetModel.getAppId()).replaceContentForDocs();
- FileUtils.writeStringToFile(docsPath.resolve("documentation.md").toFile(),
+ FileUtils.writeStringToFile(docsPath.resolve(assetModel.getAppId() +".md").toFile(),
documentationFileContents);
- // modify docs for website
- String websiteFileContents = new ImagePathReplacer(originalDocumentationFileContents,
- assetModel.getAppId()).replaceContentForWebsite();
-
- FileUtils.writeStringToFile(docsWebsitePath.resolve("documentation.md").toFile(),
- websiteFileContents);
}
Boolean existsOverviewFile = Files.exists(docsBasePath.resolve("pipeline-elements.md"));
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
index 796cecc..1e3bfb2 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/PipelineElementGridGenerator.java
@@ -89,7 +89,7 @@ public class PipelineElementGridGenerator {
}
private DomContent makeDocumentationLink() {
- return a(DOCUMENTATION).withHref("/docs/docs/" + assetModel.getAppId() + "/" +assetModel.getAppId());
+ return a(DOCUMENTATION).withHref("/docs/docs/pe/" + assetModel.getAppId());
}
private DomContent makeBlank() {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java
index b8081e4..9a1d560 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/SidebarConfigGenerator.java
@@ -33,7 +33,7 @@ public class SidebarConfigGenerator extends OutputGenerator {
public String generate() {
JsonArray pipelineElements = new JsonArray();
- assetModels.forEach(pe -> pipelineElements.add(pe.getAppId() + "/" + pe.getAppId()));
+ assetModels.forEach(pe -> pipelineElements.add("pe/" +pe.getAppId()));
JsonObject pipelineElementObject = new JsonObject();
pipelineElementObject.add("Pipeline Elements", pipelineElements);
[incubator-streampipes] 01/03: [STREAMPIPES-140] Add feature to
create adapter documentation, delete UI images from core
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit dff37c33ca4c75263603e761c75bebc66a00aeb9
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun May 24 21:31:54 2020 +0200
[STREAMPIPES-140] Add feature to create adapter documentation, delete UI images from core
---
.../streampipes/smp/ExtractDocumentationMojo.java | 27 ++++----
.../smp/extractor/ControllerFileFinder.java | 10 +--
.../Utils.java => extractor/ElementFinder.java} | 35 ++++------
.../extractor/ResourceDirectoryElementFinder.java | 72 +++++++++++++++++++++
.../smp/generator/DataJsonGenerator.java | 7 +-
.../org/apache/streampipes/smp/util/Utils.java | 4 ++
ui/src/assets/img/connect/coindesk.png | Bin 17868 -> 0 bytes
ui/src/assets/img/connect/dice.png | Bin 13079 -> 0 bytes
ui/src/assets/img/connect/file.png | Bin 12881 -> 0 bytes
ui/src/assets/img/connect/gdelt.png | Bin 33450 -> 0 bytes
ui/src/assets/img/connect/iexcloud.png | Bin 15675 -> 0 bytes
ui/src/assets/img/connect/influxdb.png | Bin 9982 -> 0 bytes
ui/src/assets/img/connect/kafka.jpg | Bin 12955 -> 0 bytes
ui/src/assets/img/connect/nsw.png | Bin 3016 -> 0 bytes
ui/src/assets/img/connect/opc.png | Bin 5087 -> 0 bytes
ui/src/assets/img/connect/pulsar.png | Bin 22890 -> 0 bytes
ui/src/assets/img/connect/rest.png | Bin 17467 -> 0 bytes
ui/src/assets/img/connect/slack.png | Bin 17473 -> 0 bytes
ui/src/assets/img/connect/sql.png | Bin 99909 -> 0 bytes
ui/src/assets/img/connect/wikipedia.png | Bin 65221 -> 0 bytes
20 files changed, 112 insertions(+), 43 deletions(-)
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
index e18eda2..46f2489 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/ExtractDocumentationMojo.java
@@ -28,7 +28,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.streampipes.smp.extractor.ControllerFileFinder;
-import org.apache.streampipes.smp.extractor.DockerImageExtractor;
+import org.apache.streampipes.smp.extractor.ResourceDirectoryElementFinder;
import org.apache.streampipes.smp.generator.*;
import org.apache.streampipes.smp.model.AssetModel;
import org.apache.streampipes.smp.util.DirectoryManager;
@@ -86,19 +86,27 @@ public class ExtractDocumentationMojo extends AbstractMojo {
for (MavenProject currentModule : projects) {
File baseDir = currentModule.getBasedir();
List<String> sourceRoots = currentModule.getCompileSourceRoots();
+ List<AssetModel> allAssetModels = new ArrayList<>();
//String targetDir = this.project.getModel().getBuild().getDirectory();
- String dockerImageName =
- new DockerImageExtractor(baseDir.getAbsolutePath()).extractImageName();
-
- List<AssetModel> allAssetModels = new ArrayList<>(new ControllerFileFinder(getLog(),
- baseDir.getAbsolutePath(), sourceRoots.get(0),
- "**/*Controller.java").makeAssetModels());
+ //String dockerImageName =
+ // new DockerImageExtractor(baseDir.getAbsolutePath()).extractImageName();
+
+ if (currentModule.getName().equals("streampipes-connect-adapters")) {
+ System.out.println("Opening adapters");
+ allAssetModels = new ResourceDirectoryElementFinder(sourceRoots.get(0), getLog(), baseDir.getAbsolutePath())
+ .makeAssetModels();
+ allAssetModels.forEach(am -> System.out.println(am.getAppId()));
+ } else {
+ allAssetModels = new ControllerFileFinder(getLog(),
+ baseDir.getAbsolutePath(), sourceRoots.get(0),
+ "**/*Controller.java").makeAssetModels();
+ }
allAssetModels.forEach(am -> {
am.setBaseDir(baseDir.getAbsolutePath());
am.setModuleName(currentModule.getName());
- am.setContainerName(dockerImageName);
+ //am.setContainerName(dockerImageName);
});
List<String> finalPipelineElementsToExclude = pipelineElementsToExclude;
@@ -106,10 +114,7 @@ public class ExtractDocumentationMojo extends AbstractMojo {
allAssetModels
.stream()
.filter(am -> finalPipelineElementsToExclude.stream().noneMatch(pe -> pe.equals(am.getAppId())))
- .filter(am -> new File(Utils.makePath(baseDir.getAbsolutePath(),
- am.getAppId())).exists())
.collect(Collectors.toList()));
-
}
try {
Collections.sort(documentedPipelineElements);
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
index 274436e..53bb645 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ControllerFileFinder.java
@@ -27,18 +27,13 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-public class ControllerFileFinder {
+public class ControllerFileFinder extends ElementFinder {
- private String sourceRoot;
private String filterPattern;
- private Log log;
- private String baseDir;
public ControllerFileFinder(Log log, String baseDir, String sourceRoot, String filterPattern) {
- this.sourceRoot = sourceRoot;
+ super(sourceRoot, log, baseDir);
this.filterPattern = filterPattern;
- this.log = log;
- this.baseDir = baseDir;
}
public String[] findFiles() {
@@ -50,6 +45,7 @@ public class ControllerFileFinder {
return fileSetManager.getIncludedFiles(fileSet);
}
+ @Override
public List<AssetModel> makeAssetModels() {
List<AssetModel> allAssetModels = new ArrayList<>();
for (String file : findFiles()) {
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java
similarity index 52%
copy from streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
copy to streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java
index 94f8b3b..9c5bc85 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ElementFinder.java
@@ -15,33 +15,24 @@
* limitations under the License.
*
*/
+package org.apache.streampipes.smp.extractor;
-package org.apache.streampipes.smp.util;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.streampipes.smp.model.AssetModel;
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.util.List;
-public class Utils {
+public abstract class ElementFinder {
- public static String makePath(String sourceRoot, String appId) {
- return sourceRoot
- + File.separator
- + "src"
- + File.separator
- + "main"
- + File.separator
- + "resources"
- + File.separator
- + appId;
- }
-
- public static Path makeResourcePath(String sourcePath, String appId) {
- return Paths.get(sourcePath, "src", "main", "resources", appId);
- }
+ protected String sourceRoot;
+ protected Log log;
+ protected String baseDir;
- public static String makeLocalesPath(String sourceRoot, String appId) {
- return makePath(sourceRoot, appId) + File.separator + "strings.en";
+ public ElementFinder(String sourceRoot, Log log, String baseDir) {
+ this.sourceRoot = sourceRoot;
+ this.log = log;
+ this.baseDir = baseDir;
}
+ public abstract List<AssetModel> makeAssetModels();
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
new file mode 100644
index 0000000..66e5ce1
--- /dev/null
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/extractor/ResourceDirectoryElementFinder.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.streampipes.smp.extractor;
+
+import org.apache.maven.plugin.logging.Log;
+import org.apache.streampipes.smp.constants.PeType;
+import org.apache.streampipes.smp.model.AssetModel;
+import org.apache.streampipes.smp.util.Utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ResourceDirectoryElementFinder extends ElementFinder {
+
+
+ public ResourceDirectoryElementFinder(String sourceRoot, Log log, String baseDir) {
+ super(sourceRoot, log, baseDir);
+ System.out.println(sourceRoot);
+ System.out.println(baseDir);
+ }
+
+ @Override
+ public List<AssetModel> makeAssetModels() {
+ List<AssetModel> adapterModels = new ArrayList<>();
+ Path resourceDirPath = Utils.makeResourcePath(baseDir);
+ File[] resourceDirs = resourceDirPath.toFile().listFiles(File::isDirectory);
+ if (resourceDirs != null) {
+ List<File> appDirs = Arrays.stream(resourceDirs)
+ .filter(rd -> rd.getName().startsWith("org.apache.streampipes"))
+ .collect(Collectors.toList());
+
+ appDirs.forEach(ap -> {
+ try {
+ adapterModels.add(extractModel(baseDir, ap));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ });
+ }
+
+ return adapterModels;
+ }
+
+ private AssetModel extractModel(String sourceRoot, File resourceDir) throws IOException {
+ AssetModel model = new AssetModel();
+
+ model.setPeType(PeType.ADAPTER);
+ model.setAppId(resourceDir.getName());
+ return new LocalesExtractor(sourceRoot, model).extract();
+ }
+
+}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
index 5b0059e..4d1dc3c 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/generator/DataJsonGenerator.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.smp.generator;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
+import org.apache.streampipes.smp.constants.PeType;
import org.apache.streampipes.smp.model.AssetModel;
import java.util.List;
@@ -54,14 +55,14 @@ public class DataJsonGenerator extends OutputGenerator {
entry.addProperty("type", am.getPeType().getFriendly());
entry.addProperty("name", am.getPipelineElementName());
entry.addProperty("description", am.getPipelineElementDescription());
- entry.addProperty("dockerHubLink", makeDockerHubLink(am.getModuleName()));
+ entry.addProperty("dockerHubLink", makeDockerHubLink(am.getPeType(), am.getModuleName()));
entry.addProperty("githubLink", makeGithubLink(am.getModuleName()));
return entry;
}
- private String makeDockerHubLink(String moduleName) {
- String dockerHubRepoName = moduleName.replace("streampipes-", "");
+ private String makeDockerHubLink(PeType peType, String moduleName) {
+ String dockerHubRepoName = peType == PeType.ADAPTER ? "connect-worker" : moduleName.replace("streampipes-", "");
return "https://hub.docker.com/r/apachestreampipes/" +dockerHubRepoName;
}
diff --git a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
index 94f8b3b..92ed179 100644
--- a/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
+++ b/streampipes-maven-plugin/src/main/java/org/apache/streampipes/smp/util/Utils.java
@@ -36,6 +36,10 @@ public class Utils {
+ appId;
}
+ public static Path makeResourcePath(String sourcePath) {
+ return Paths.get(sourcePath, "src", "main", "resources");
+ }
+
public static Path makeResourcePath(String sourcePath, String appId) {
return Paths.get(sourcePath, "src", "main", "resources", appId);
}
diff --git a/ui/src/assets/img/connect/coindesk.png b/ui/src/assets/img/connect/coindesk.png
deleted file mode 100644
index 420be61..0000000
Binary files a/ui/src/assets/img/connect/coindesk.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/dice.png b/ui/src/assets/img/connect/dice.png
deleted file mode 100644
index 05cc7c3..0000000
Binary files a/ui/src/assets/img/connect/dice.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/file.png b/ui/src/assets/img/connect/file.png
deleted file mode 100644
index 2b3a037..0000000
Binary files a/ui/src/assets/img/connect/file.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/gdelt.png b/ui/src/assets/img/connect/gdelt.png
deleted file mode 100644
index b9ec80c..0000000
Binary files a/ui/src/assets/img/connect/gdelt.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/iexcloud.png b/ui/src/assets/img/connect/iexcloud.png
deleted file mode 100644
index 48afa81..0000000
Binary files a/ui/src/assets/img/connect/iexcloud.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/influxdb.png b/ui/src/assets/img/connect/influxdb.png
deleted file mode 100644
index 1f9bb88..0000000
Binary files a/ui/src/assets/img/connect/influxdb.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/kafka.jpg b/ui/src/assets/img/connect/kafka.jpg
deleted file mode 100644
index e882823..0000000
Binary files a/ui/src/assets/img/connect/kafka.jpg and /dev/null differ
diff --git a/ui/src/assets/img/connect/nsw.png b/ui/src/assets/img/connect/nsw.png
deleted file mode 100644
index f9ab06c..0000000
Binary files a/ui/src/assets/img/connect/nsw.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/opc.png b/ui/src/assets/img/connect/opc.png
deleted file mode 100644
index ab68d43..0000000
Binary files a/ui/src/assets/img/connect/opc.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/pulsar.png b/ui/src/assets/img/connect/pulsar.png
deleted file mode 100644
index d1b1228..0000000
Binary files a/ui/src/assets/img/connect/pulsar.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/rest.png b/ui/src/assets/img/connect/rest.png
deleted file mode 100644
index b44424d..0000000
Binary files a/ui/src/assets/img/connect/rest.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/slack.png b/ui/src/assets/img/connect/slack.png
deleted file mode 100644
index 4a86273..0000000
Binary files a/ui/src/assets/img/connect/slack.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/sql.png b/ui/src/assets/img/connect/sql.png
deleted file mode 100644
index 084246f..0000000
Binary files a/ui/src/assets/img/connect/sql.png and /dev/null differ
diff --git a/ui/src/assets/img/connect/wikipedia.png b/ui/src/assets/img/connect/wikipedia.png
deleted file mode 100644
index 46112dc..0000000
Binary files a/ui/src/assets/img/connect/wikipedia.png and /dev/null differ