diff --git a/src/main/java/io/github/swagger2markup/internal/component/PropertiesTableComponent.java b/src/main/java/io/github/swagger2markup/internal/component/PropertiesTableComponent.java old mode 100644 new mode 100755 index f3b8bb39..9405b526 --- a/src/main/java/io/github/swagger2markup/internal/component/PropertiesTableComponent.java +++ b/src/main/java/io/github/swagger2markup/internal/component/PropertiesTableComponent.java @@ -21,6 +21,7 @@ import io.github.swagger2markup.Swagger2MarkupConverter; import io.github.swagger2markup.internal.adapter.PropertyAdapter; import io.github.swagger2markup.internal.resolver.DocumentResolver; import io.github.swagger2markup.internal.type.ObjectType; +import io.github.swagger2markup.internal.type.RefType; import io.github.swagger2markup.internal.type.Type; import io.github.swagger2markup.markup.builder.MarkupDocBuilder; import io.github.swagger2markup.spi.MarkupComponent; @@ -56,30 +57,30 @@ public class PropertiesTableComponent extends MarkupComponent properties, - String parameterName, - List inlineDefinitions) { + String parameterName, + List inlineDefinitions) { return new PropertiesTableComponent.Parameters(properties, parameterName, inlineDefinitions); } public MarkupDocBuilder apply(MarkupDocBuilder markupDocBuilder, Parameters params) { //TODO: This method is too complex, split it up in smaller methods to increase readability StringColumn.Builder nameColumnBuilder = StringColumn.builder(ColumnIds.StringColumnId.of(labels.getLabel(NAME_COLUMN))) - .putMetaData(TableComponent.WIDTH_RATIO, "3"); + .putMetaData(TableComponent.WIDTH_RATIO, "3"); StringColumn.Builder descriptionColumnBuilder = StringColumn.builder(ColumnIds.StringColumnId.of(labels.getLabel(DESCRIPTION_COLUMN))) - .putMetaData(TableComponent.WIDTH_RATIO, "11") - .putMetaData(TableComponent.HEADER_COLUMN, "true"); + .putMetaData(TableComponent.WIDTH_RATIO, "11") + .putMetaData(TableComponent.HEADER_COLUMN, "true"); StringColumn.Builder schemaColumnBuilder = StringColumn.builder(ColumnIds.StringColumnId.of(labels.getLabel(SCHEMA_COLUMN))) - .putMetaData(TableComponent.WIDTH_RATIO, "4") - .putMetaData(TableComponent.HEADER_COLUMN, "true"); + .putMetaData(TableComponent.WIDTH_RATIO, "4") + .putMetaData(TableComponent.HEADER_COLUMN, "true"); Map properties = params.properties; if (MapUtils.isNotEmpty(properties)) { @@ -166,7 +167,7 @@ public class PropertiesTableComponent extends MarkupComponent> + * + * @param possibleAnchor String to check + * @return true if the string is a link to an anchor, false otherwise + */ + private boolean isReferenceLink(String possibleAnchor) { + return possibleAnchor.startsWith("<<_") && possibleAnchor.endsWith(">>"); } public static class Parameters { @@ -209,8 +225,8 @@ public class PropertiesTableComponent extends MarkupComponent inlineDefinitions; public Parameters(Map properties, - String parameterName, - List inlineDefinitions) { + String parameterName, + List inlineDefinitions) { this.properties = Validate.notNull(properties, "Properties must not be null"); this.parameterName = Validate.notBlank(parameterName, "ParameterName must not be blank"); diff --git a/src/test/resources/expected/asciidoc/basepathprefix/definitions.adoc b/src/test/resources/expected/asciidoc/basepathprefix/definitions.adoc old mode 100644 new mode 100755 index 4bd8a9b7..dd317c6d --- a/src/test/resources/expected/asciidoc/basepathprefix/definitions.adoc +++ b/src/test/resources/expected/asciidoc/basepathprefix/definitions.adoc @@ -83,7 +83,7 @@ Test description |=== |Name|Description|Schema |**category** + -__optional__|**Example** : `"<<_category>>"`|<<_category,Category>> +__optional__|**Example** : <<_category>>|<<_category,Category>> |**id** + __optional__|**Example** : `0`|integer (int64) |**name** + diff --git a/src/test/resources/expected/asciidoc/generated_examples/definitions.adoc b/src/test/resources/expected/asciidoc/generated_examples/definitions.adoc old mode 100644 new mode 100755 index 4bd8a9b7..dd317c6d --- a/src/test/resources/expected/asciidoc/generated_examples/definitions.adoc +++ b/src/test/resources/expected/asciidoc/generated_examples/definitions.adoc @@ -83,7 +83,7 @@ Test description |=== |Name|Description|Schema |**category** + -__optional__|**Example** : `"<<_category>>"`|<<_category,Category>> +__optional__|**Example** : <<_category>>|<<_category,Category>> |**id** + __optional__|**Example** : `0`|integer (int64) |**name** +