Skip to content

Commit d0f4f31

Browse files
author
Vincent Potucek
committed
avoid implicit (un)used non-abstract API MavenInvoker#customizeSettingsRequest
1 parent e19aa49 commit d0f4f31

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,7 @@ protected Consumer<String> doDetermineWriter(C context) {
407407
} else {
408408
// Given the terminal creation has been offloaded to a different thread,
409409
// do not pass directly the terminal writer
410-
return msg -> {
411-
PrintWriter pw = context.terminal.writer();
412-
pw.println(msg);
413-
pw.flush();
414-
};
410+
return msg -> context.terminal.writer().println(msg);
415411
}
416412
}
417413

@@ -442,10 +438,9 @@ protected void activateLogging(C context) throws Exception {
442438
}
443439

444440
// at this point logging is set up, reply so far accumulated logs, if any and swap logger with real one
445-
Logger logger =
441+
context.logger =
446442
new Slf4jLogger(context.loggerFactory.getLogger(getClass().getName()));
447-
context.logger.drain().forEach(e -> logger.log(e.level(), e.message(), e.error()));
448-
context.logger = logger;
443+
context.logger.drain().forEach(e -> context.logger.log(e.level(), e.message(), e.error()));
449444
}
450445

451446
protected void helpOrVersionAndMayExit(C context) throws Exception {
@@ -716,11 +711,6 @@ protected Runnable settings(C context, boolean emitSettingsWarnings, SettingsBui
716711
};
717712
}
718713

719-
protected void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest)
720-
throws Exception {}
721-
722-
protected void customizeSettingsResult(C context, SettingsBuilderResult settingsBuilderResult) throws Exception {}
723-
724714
protected boolean mayDisableInteractiveMode(C context, boolean proposedInteractive) {
725715
if (!context.invokerRequest.options().forceInteractive().orElse(false)) {
726716
if (context.invokerRequest.options().nonInteractive().orElse(false)) {
@@ -936,4 +926,10 @@ protected int calculateDegreeOfConcurrency(String threadConfiguration) {
936926
}
937927

938928
protected abstract int execute(C context) throws Exception;
929+
930+
protected abstract void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest)
931+
throws Exception;
932+
933+
protected abstract void customizeSettingsResult(C context, SettingsBuilderResult settingsBuilderResult)
934+
throws Exception;
939935
}

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import org.apache.maven.api.cli.mvn.MavenOptions;
4242
import org.apache.maven.api.services.BuilderProblem;
4343
import org.apache.maven.api.services.Lookup;
44+
import org.apache.maven.api.services.SettingsBuilderRequest;
45+
import org.apache.maven.api.services.SettingsBuilderResult;
4446
import org.apache.maven.api.services.Sources;
4547
import org.apache.maven.api.services.ToolchainsBuilder;
4648
import org.apache.maven.api.services.ToolchainsBuilderRequest;
@@ -92,6 +94,14 @@ protected MavenContext createContext(InvokerRequest invokerRequest) {
9294
return new MavenContext(invokerRequest);
9395
}
9496

97+
@Override
98+
protected void customizeSettingsRequest(MavenContext context, SettingsBuilderRequest settingsBuilderRequest)
99+
throws Exception {}
100+
101+
@Override
102+
protected void customizeSettingsResult(MavenContext context, SettingsBuilderResult settingsBuilderResult)
103+
throws Exception {}
104+
95105
@Override
96106
protected int execute(MavenContext context) throws Exception {
97107
MavenExecutionRequest request = prepareMavenExecutionRequest();

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/EncryptInvoker.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import org.apache.maven.api.cli.InvokerRequest;
2727
import org.apache.maven.api.cli.mvnenc.EncryptOptions;
2828
import org.apache.maven.api.services.Lookup;
29+
import org.apache.maven.api.services.SettingsBuilderRequest;
30+
import org.apache.maven.api.services.SettingsBuilderResult;
2931
import org.apache.maven.cling.invoker.LookupContext;
3032
import org.apache.maven.cling.invoker.LookupInvoker;
3133
import org.apache.maven.cling.utils.CLIReportingUtils;
@@ -110,6 +112,14 @@ protected int execute(EncryptContext context) throws Exception {
110112
}
111113
}
112114

115+
@Override
116+
protected void customizeSettingsRequest(EncryptContext context, SettingsBuilderRequest settingsBuilderRequest)
117+
throws Exception {}
118+
119+
@Override
120+
protected void customizeSettingsResult(EncryptContext context, SettingsBuilderResult settingsBuilderResult)
121+
throws Exception {}
122+
113123
protected int badGoalsErrorMessage(String message, EncryptContext context) {
114124
context.logger.error(message);
115125
context.logger.error("Supported goals are: " + String.join(", ", context.goals.keySet()));

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnsh/ShellInvoker.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
import org.apache.maven.api.cli.InvokerRequest;
2626
import org.apache.maven.api.services.Lookup;
27+
import org.apache.maven.api.services.SettingsBuilderRequest;
28+
import org.apache.maven.api.services.SettingsBuilderResult;
2729
import org.apache.maven.cling.invoker.LookupContext;
2830
import org.apache.maven.cling.invoker.LookupInvoker;
2931
import org.apache.maven.cling.utils.CLIReportingUtils;
@@ -197,4 +199,12 @@ protected void commandStyle(LineReader reader, AttributedStringBuilder sb, boole
197199
}
198200
}
199201
}
202+
203+
@Override
204+
protected void customizeSettingsRequest(LookupContext context, SettingsBuilderRequest settingsBuilderRequest)
205+
throws Exception {}
206+
207+
@Override
208+
protected void customizeSettingsResult(LookupContext context, SettingsBuilderResult settingsBuilderResult)
209+
throws Exception {}
200210
}

0 commit comments

Comments
 (0)