Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
b0fa58e8
Commit
b0fa58e8
authored
Jul 30, 2019
by
vivganes
Committed by
Stephane Nicoll
Jul 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape reserved asciidoc character in generated documentation
See gh-17663
parent
d9826759
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
SingleConfigurationTableEntry.java
...boot/configurationdocs/SingleConfigurationTableEntry.java
+1
-1
SingleConfigurationTableEntryTests.java
...configurationdocs/SingleConfigurationTableEntryTests.java
+14
-0
No files found.
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntry.java
View file @
b0fa58e8
...
@@ -76,7 +76,7 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry {
...
@@ -76,7 +76,7 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry {
builder
.
append
(
"|"
);
builder
.
append
(
"|"
);
}
}
else
{
else
{
builder
.
append
(
"|+++"
,
this
.
description
,
"+++"
);
builder
.
append
(
"|+++"
,
this
.
description
.
replace
(
"|"
,
"\\|"
)
,
"+++"
);
}
}
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/test/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntryTests.java
View file @
b0fa58e8
...
@@ -86,6 +86,20 @@ class SingleConfigurationTableEntryTests {
...
@@ -86,6 +86,20 @@ class SingleConfigurationTableEntryTests {
+
"|+++This is a description.+++"
+
NEWLINE
);
+
"|+++This is a description.+++"
+
NEWLINE
);
}
}
@Test
void
descriptionWithPipe
()
{
ConfigurationMetadataProperty
property
=
new
ConfigurationMetadataProperty
();
property
.
setId
(
"spring.test.prop"
);
property
.
setDefaultValue
(
"first\\second"
);
property
.
setDescription
(
"This is a description with a | pipe."
);
property
.
setType
(
"java.lang.String"
);
SingleConfigurationTableEntry
entry
=
new
SingleConfigurationTableEntry
(
property
);
AsciidocBuilder
builder
=
new
AsciidocBuilder
();
entry
.
write
(
builder
);
assertThat
(
builder
.
toString
()).
isEqualTo
(
"|`+spring.test.prop+`"
+
NEWLINE
+
"|`+first\\\\second+`"
+
NEWLINE
+
"|+++This is a description with a \\| pipe.+++"
+
NEWLINE
);
}
@Test
@Test
void
mapProperty
()
{
void
mapProperty
()
{
ConfigurationMetadataProperty
property
=
new
ConfigurationMetadataProperty
();
ConfigurationMetadataProperty
property
=
new
ConfigurationMetadataProperty
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment