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

Jump to bottom

Changes for config cogs tweak #7023

Merged
merged 1 commit into from Feb 21, 2020
Merged

Changes for config cogs tweak #7023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions core/processor/src/main/java/io/quarkus/annotation/processor/Constants.java
View file
Open in desktop
Expand Up @@ -73,12 +73,10 @@ final public class Constants {
public static final String MEMORY_SIZE_INFORMATION = String.format(Constants.MORE_INFO_ABOUT_TYPE_FORMAT,
Constants.MEMORY_SIZE_NOTE_ANCHOR, "MemorySize");

public static final String CONFIG_PHASE_RUNTIME_ILLUSTRATION = "icon:cogs[title=Overridable at runtime]";
public static final String CONFIG_PHASE_BOOTSTRAP_ILLUSTRATION = "icon:cogs[title=Bootstrap - Overridable at runtime]";
public static final String CONFIG_PHASE_BUILD_TIME_ILLUSTRATION = "icon:archive[title=Fixed at build time]";
public static final String CONFIG_PHASE_BUILD_TIME_ILLUSTRATION = "icon:lock[title=Fixed at build time]";
public static final String CONFIG_PHASE_LEGEND = String.format(
"%n%s Configuration property fixed at build time - %s️ Configuration property overridable at runtime %n",
CONFIG_PHASE_BUILD_TIME_ILLUSTRATION, CONFIG_PHASE_RUNTIME_ILLUSTRATION);
"%n%s Configuration property fixed at build time - All other configuration properties are overridable at runtime",
CONFIG_PHASE_BUILD_TIME_ILLUSTRATION);

public static final String DURATION_FORMAT_NOTE = "\n[NOTE]" +
"\n[[" + DURATION_NOTE_ANCHOR + "]]\n" +
Expand Down
4 changes: 2 additions & 2 deletions core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigPhase.java
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
import io.quarkus.annotation.processor.Constants;

public enum ConfigPhase implements Comparable<ConfigPhase> {
RUN_TIME("The configuration is overridable at runtime", Constants.CONFIG_PHASE_RUNTIME_ILLUSTRATION, "RunTime"),
RUN_TIME("The configuration is overridable at runtime", "", "RunTime"),
BOOTSTRAP("The configuration is used to bootstrap runtime Config Sources and is overridable at runtime",
Constants.CONFIG_PHASE_BOOTSTRAP_ILLUSTRATION, "Bootstrap"),
"", "Bootstrap"),
BUILD_TIME("The configuration is not overridable at runtime", Constants.CONFIG_PHASE_BUILD_TIME_ILLUSTRATION, "BuildTime"),
BUILD_AND_RUN_TIME_FIXED("The configuration is not overridable at runtime", Constants.CONFIG_PHASE_BUILD_TIME_ILLUSTRATION,
"BuildTime");
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/all-config.adoc
View file
Open in desktop
Expand Up @@ -10,4 +10,4 @@ https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc

include::./attributes.adoc[]

include::{generated-dir}/config/all-config.adoc[opts=optional]
include::{generated-dir}/config/quarkus-all-config.adoc[opts=optional]
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/stylesheet/config.css
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ table.configuration-reference.tableblock tbody tr td {
}

table.configuration-reference.tableblock tbody tr td > .content > .paragraph .icon {
margin-left: -25px;
margin-left: -19px;
margin-top: 5px;
float: left;
}
Expand Down
3 changes: 2 additions & 1 deletion docs/src/main/java/io/quarkus/docs/generation/AllConfigGenerator.java
View file
Open in desktop
Expand Up @@ -175,7 +175,8 @@ public static void main(String[] args) throws AppModelResolverException, IOExcep
}

// write our docs
ConfigDocGeneratedOutput allConfigGeneratedOutput = new ConfigDocGeneratedOutput("all-config.adoc", true, allItems,
ConfigDocGeneratedOutput allConfigGeneratedOutput = new ConfigDocGeneratedOutput("quarkus-all-config.adoc", true,
allItems,
false);
configDocWriter.writeAllExtensionConfigDocumentation(allConfigGeneratedOutput);
}
Expand Down