You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/06/21 07:09:37 UTC
[servicecomb-toolkit] 21/49: Optimize document styles and add
remote resource reads
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit f2f510db0e660266b8435e558d0346abf29001c3
Author: kakulisen <18...@163.com>
AuthorDate: Mon May 27 16:44:56 2019 +0800
Optimize document styles and add remote resource reads
Signed-off-by: kakulisen <18...@163.com>
---
.../toolkit/docgen/ContractsAsciidocGenerator.java | 1 -
.../java/org/apache/servicecomb/toolkit/cli/DocGenerate.java | 12 +++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/doc-generator/src/main/java/org/apache/servicecomb/toolkit/docgen/ContractsAsciidocGenerator.java b/doc-generator/src/main/java/org/apache/servicecomb/toolkit/docgen/ContractsAsciidocGenerator.java
index 7009653..42133f7 100755
--- a/doc-generator/src/main/java/org/apache/servicecomb/toolkit/docgen/ContractsAsciidocGenerator.java
+++ b/doc-generator/src/main/java/org/apache/servicecomb/toolkit/docgen/ContractsAsciidocGenerator.java
@@ -71,7 +71,6 @@ public class ContractsAsciidocGenerator implements DocGenerator {
.attribute("toclevels", 3)
.attribute(Attributes.TOC_2, true)
.attribute(Attributes.TOC_POSITION, "left")
- .attribute(Attributes.LINK_CSS, true)
.attribute(Attributes.SECTION_NUMBERS, true)
.attribute(Attributes.SECT_NUM_LEVELS, 4))
.asMap();
diff --git a/toolkit-cli/src/main/java/org/apache/servicecomb/toolkit/cli/DocGenerate.java b/toolkit-cli/src/main/java/org/apache/servicecomb/toolkit/cli/DocGenerate.java
index e468973..7113b9c 100755
--- a/toolkit-cli/src/main/java/org/apache/servicecomb/toolkit/cli/DocGenerate.java
+++ b/toolkit-cli/src/main/java/org/apache/servicecomb/toolkit/cli/DocGenerate.java
@@ -19,6 +19,7 @@ package org.apache.servicecomb.toolkit.cli;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -62,13 +63,18 @@ public class DocGenerate implements Runnable {
DocGeneratorManager.generate(SwaggerUtils.parseSwagger(file.toUri().toURL()),
output + File.separator + file.toFile().getName().substring(0, file.toFile().getName().indexOf(".")),
- format);
+ format);
return super.visitFile(file, attrs);
}
});
- } else {
+ } else if (Files.isRegularFile(specPath)) {
- DocGeneratorManager.generate(SwaggerUtils.parseSwagger(new File(specFile).toURI().toURL()),
+ DocGeneratorManager.generate(SwaggerUtils.parseSwagger(specPath.toUri().toURL()),
+ output + File.separator + new File(specFile).getName()
+ .substring(0, new File(specFile).getName().indexOf(".")),
+ format);
+ } else {
+ DocGeneratorManager.generate(SwaggerUtils.parseSwagger(URI.create(specFile).toURL()),
output + File.separator + new File(specFile).getName()
.substring(0, new File(specFile).getName().indexOf(".")),
format);