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:23 UTC

[incubator-streampipes] 02/03: Fix errors in documentation generator

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);