Skip to content

Commit e40698e

Browse files
radcortezgsmet
authored andcommitted
Remove deprecated Console configuration
1 parent 83438f8 commit e40698e

File tree

5 files changed

+3
-57
lines changed

5 files changed

+3
-57
lines changed

core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static synchronized void installConsole(TestConfig config, ConsoleConfig
2323
//if there is no color we need a basic console
2424
//note that we never enable input for tests
2525
//surefire communicates of stdin, so this can mess with it
26-
boolean inputSupport = !test && !config.disableConsoleInput().orElse(consoleConfig.disableInput());
26+
boolean inputSupport = !test && !consoleConfig.disableInput();
2727
if (!inputSupport) {
2828
//note that in this case we don't hold onto anything from this class loader
2929
//which is important for the test suite
@@ -34,7 +34,7 @@ public static synchronized void installConsole(TestConfig config, ConsoleConfig
3434
new TerminalConnection(new Consumer<Connection>() {
3535
@Override
3636
public void accept(Connection connection) {
37-
if (connection.supportsAnsi() && !config.basicConsole().orElse(consoleConfig.basic())) {
37+
if (connection.supportsAnsi() && !consoleConfig.basic()) {
3838
QuarkusConsole.INSTANCE = new AeshConsole(connection);
3939
} else {
4040
LinkedBlockingDeque<Integer> queue = new LinkedBlockingDeque<>();

core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ConsoleInstalledBuildItem setupConsole(
6666
return ConsoleInstalledBuildItem.INSTANCE;
6767
}
6868
consoleInstalled = true;
69-
if (config.console().orElse(consoleConfig.enabled())) {
69+
if (consoleConfig.enabled()) {
7070
ConsoleHelper.installConsole(config, consoleConfig, launchModeBuildItem.isTest());
7171
ConsoleStateManager.init(QuarkusConsole.INSTANCE, launchModeBuildItem.getDevModeType().get());
7272
//note that this bit needs to be refactored so it is no longer tied to continuous testing

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -100,45 +100,6 @@ public interface TestConfig {
100100
*/
101101
Optional<List<String>> excludeEngines();
102102

103-
/**
104-
* Disable the testing status/prompt message at the bottom of the console
105-
* and log these messages to STDOUT instead.
106-
* <p>
107-
* Use this option if your terminal does not support ANSI escape sequences.
108-
* <p>
109-
* This is deprecated, {@literal quarkus.console.basic} should be used instead.
110-
*/
111-
@Deprecated
112-
Optional<Boolean> basicConsole();
113-
114-
/**
115-
* Disable color in the testing status and prompt messages.
116-
* <p>
117-
* Use this option if your terminal does not support color.
118-
* <p>
119-
* This is deprecated, {@literal quarkus.console.disable-color} should be used instead.
120-
*/
121-
@Deprecated
122-
Optional<Boolean> disableColor();
123-
124-
/**
125-
* If test results and status should be displayed in the console.
126-
* <p>
127-
* If this is false results can still be viewed in the dev console.
128-
* <p>
129-
* This is deprecated, {@literal quarkus.console.enabled} should be used instead.
130-
*/
131-
@Deprecated
132-
Optional<Boolean> console();
133-
134-
/**
135-
* Disables the ability to enter input on the console.
136-
* <p>
137-
* This is deprecated, {@literal quarkus.console.disable-input} should be used instead.
138-
*/
139-
@Deprecated
140-
Optional<Boolean> disableConsoleInput();
141-
142103
/**
143104
* Changes tests to use the 'flat' ClassPath used in Quarkus 1.x versions.
144105
* <p>

core/runtime/src/main/java/io/quarkus/runtime/logging/LogRuntimeConfig.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -313,18 +313,6 @@ interface ConsoleConfig {
313313
@WithConverter(LevelConverter.class)
314314
Level level();
315315

316-
/**
317-
* If the console logging should be in color. If undefined, Quarkus takes
318-
* best guess based on the operating system and environment.
319-
* Note that this value is ignored if an extension is present that takes
320-
* control of console formatting (e.g., an XML or JSON-format extension).
321-
* <p>
322-
* This has been deprecated and replaced with <code>quarkus.console.color</code>,
323-
* as Quarkus now provides more console-based functionality than just logging.
324-
*/
325-
@Deprecated
326-
Optional<Boolean> color();
327-
328316
/**
329317
* Specify how much the colors should be darkened.
330318
* Note that this value is ignored if an extension is present that takes

core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -875,9 +875,6 @@ private static boolean isColorEnabled(ConsoleRuntimeConfig consoleConfig, Consol
875875
if (consoleConfig.color().isPresent()) {
876876
return consoleConfig.color().get();
877877
}
878-
if (logConfig.color().isPresent()) {
879-
return logConfig.color().get();
880-
}
881878
return QuarkusConsole.hasColorSupport();
882879
}
883880

0 commit comments

Comments
 (0)