Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #5214 #5218

Merged
merged 3 commits into from
Nov 6, 2019
Merged

Fix for #5214 #5218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9739bac
Fix for #5214
FroMage Nov 5, 2019
1586a8f
Fix all-config odd/even rows by not looking into member tables
FroMage Nov 5, 2019
301c5a5
Workaround #5214 for openapi table
FroMage Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/src/main/asciidoc/javascript/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ if(tables){
}

var rowIdx = 0;
for (var row of table.querySelectorAll("tr")) {
var heads = row.querySelectorAll("th");
for (var row of table.querySelectorAll("table.configuration-reference > tbody > tr")) {
var heads = row.querySelectorAll("table.configuration-reference > tbody > tr > th");
if(!heads || heads.length == 0){
// mark even rows
if(++rowIdx % 2){
Expand Down Expand Up @@ -193,8 +193,8 @@ function applySearch(table, search, autoExpand){
clearHighlights(table);
var lastSectionHeader = null;
var idx = 0;
for (var row of table.querySelectorAll("tr")) {
var heads = row.querySelectorAll("th");
for (var row of table.querySelectorAll("table.configuration-reference > tbody > tr")) {
var heads = row.querySelectorAll("table.configuration-reference > tbody > tr > th");
if(!heads || heads.length == 0){
// mark even rows
if(++idx % 2){
Expand Down
8 changes: 7 additions & 1 deletion docs/src/main/java/io/quarkus/docs/generation/AllConfigGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ public static void main(String[] args)
List<ConfigDocItem> allItems = new ArrayList<>();
SortedMap<String, List<ConfigDocItem>> sortedConfigItemsByExtension = new TreeMap<>();

// Temporary fix for https://github.com/quarkusio/quarkus/issues/5214 until we figure out how to fix it
Extension openApi = extensionsByGav.get("io.quarkus:quarkus-smallrye-openapi");
if (openApi != null)
extensionsByConfigRoots.put("io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig", openApi);

// sort extensions by name, assign their config items based on their config roots
for (Entry<String, Extension> entry : extensionsByConfigRoots.entrySet()) {
List<ConfigDocItem> items = docItemsByConfigRoots.get(entry.getKey());
Expand Down Expand Up @@ -212,7 +217,8 @@ private static void collectConfigRoots(ZipFile zf, Extension extension, Map<Stri
if (entry != null) {
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(zf.getInputStream(entry), StandardCharsets.UTF_8))) {
reader.lines().map(String::trim).filter(str -> !str.isEmpty())
// make sure we turn $ into . because javadoc-scanned class names are dot-separated
reader.lines().map(String::trim).filter(str -> !str.isEmpty()).map(str -> str.replace('$', '.'))
.forEach(klass -> extensionsByConfigRoots.put(klass, extension));
}
}
Expand Down