mindol1004/swagger2markup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SecurityDocument : WorkAround AsciiDoctor HTML conversion bug with + on the last paragraph line when using hardbreaks

Browse Source 
SecurityDocument : Use italic for informations keys.
This commit is contained in:
Hugo de Paix de Coeur
2016-04-06 14:27:04 +02:00
parent 1a45054b5d
commit 3e9fca8a0d
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/swagger2markup/internal/document/builder/OverviewDocumentBuilder.java
View File

@@ -136,10 +136,10 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder {
) { ) {
this.markupDocBuilder.sectionTitleLevel2(LICENSE_INFORMATION); this.markupDocBuilder.sectionTitleLevel2(LICENSE_INFORMATION);
MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false); MarkupDocBuilder paragraph = this.markupDocBuilder.copy(false);
if (isNotBlank(license.getName())) { if (license != null && isNotBlank(license.getName())) {
paragraph.italicText(LICENSE).textLine(COLON + license.getName()); paragraph.italicText(LICENSE).textLine(COLON + license.getName());
} }
if (isNotBlank(license.getUrl())) { if (license != null && isNotBlank(license.getUrl())) {
paragraph.italicText(LICENSE_URL).textLine(COLON + license.getUrl()); paragraph.italicText(LICENSE_URL).textLine(COLON + license.getUrl());
} }
if(isNotBlank(termOfService)){ if(isNotBlank(termOfService)){

23
src/main/java/io/github/swagger2markup/internal/document/builder/SecurityDocumentBuilder.java
View File

@@ -40,6 +40,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
public class SecurityDocumentBuilder extends MarkupDocumentBuilder { public class SecurityDocumentBuilder extends MarkupDocumentBuilder {
private static final String SECURITY_ANCHOR = "securityScheme"; private static final String SECURITY_ANCHOR = "securityScheme";
private static final String COLON = " : ";
private final String SECURITY; private final String SECURITY;
private final String TYPE; private final String TYPE;
private final String NAME; private final String NAME;
@@ -102,20 +103,26 @@ public class SecurityDocumentBuilder extends MarkupDocumentBuilder {
private void buildSecurityScheme(SecuritySchemeDefinition securityScheme) { private void buildSecurityScheme(SecuritySchemeDefinition securityScheme) {
String type = securityScheme.getType(); String type = securityScheme.getType();
markupDocBuilder.textLine(TYPE + " : " + type); MarkupDocBuilder paragraph = markupDocBuilder.copy(false);
paragraph.italicText(TYPE).textLine(COLON + type);
if (securityScheme instanceof ApiKeyAuthDefinition) { if (securityScheme instanceof ApiKeyAuthDefinition) {
markupDocBuilder.textLine(NAME + " : " + ((ApiKeyAuthDefinition) securityScheme).getName()); paragraph.italicText(NAME).textLine(COLON + ((ApiKeyAuthDefinition) securityScheme).getName());
markupDocBuilder.textLine(IN + " : " + ((ApiKeyAuthDefinition) securityScheme).getIn()); paragraph.italicText(IN).textLine(COLON + ((ApiKeyAuthDefinition) securityScheme).getIn());
markupDocBuilder.paragraph(paragraph.toString(), true);
} else if (securityScheme instanceof OAuth2Definition) { } else if (securityScheme instanceof OAuth2Definition) {
OAuth2Definition oauth2Scheme = (OAuth2Definition) securityScheme; OAuth2Definition oauth2Scheme = (OAuth2Definition) securityScheme;
String flow = oauth2Scheme.getFlow(); String flow = oauth2Scheme.getFlow();
markupDocBuilder.textLine(FLOW + " : " + flow); paragraph.italicText(FLOW).textLine(COLON + flow);
if (isNotBlank(oauth2Scheme.getAuthorizationUrl())) { if (isNotBlank(oauth2Scheme.getAuthorizationUrl())) {
markupDocBuilder.textLine(AUTHORIZATION_URL + " : " + oauth2Scheme.getAuthorizationUrl()); paragraph.italicText(AUTHORIZATION_URL).textLine(COLON + oauth2Scheme.getAuthorizationUrl());
} }
if (isNotBlank(oauth2Scheme.getTokenUrl())) { if (isNotBlank(oauth2Scheme.getTokenUrl())) {
markupDocBuilder.textLine(TOKEN_URL + " : " + oauth2Scheme.getTokenUrl()); paragraph.italicText(TOKEN_URL).textLine(COLON + oauth2Scheme.getTokenUrl());
} }
List<List<String>> cells = new ArrayList<>(); List<List<String>> cells = new ArrayList<>();
List<MarkupTableColumn> cols = Arrays.asList(new MarkupTableColumn(NAME_COLUMN).withWidthRatio(1), List<MarkupTableColumn> cols = Arrays.asList(new MarkupTableColumn(NAME_COLUMN).withWidthRatio(1),
new MarkupTableColumn(DESCRIPTION_COLUMN).withWidthRatio(6)); new MarkupTableColumn(DESCRIPTION_COLUMN).withWidthRatio(6));
@@ -123,7 +130,11 @@ public class SecurityDocumentBuilder extends MarkupDocumentBuilder {
List<String> content = Arrays.asList(scope.getKey(), scope.getValue()); List<String> content = Arrays.asList(scope.getKey(), scope.getValue());
cells.add(content); cells.add(content);
} }
markupDocBuilder.paragraph(paragraph.toString(), true);
markupDocBuilder.tableWithColumnSpecs(cols, cells); markupDocBuilder.tableWithColumnSpecs(cols, cells);
} else {
markupDocBuilder.paragraph(paragraph.toString(), true);
} }
} }