Skip to content

Commit 6f9277a

Browse files
author
Vincent Potucek
committed
try can use automatic resource management
1 parent f75454a commit 6f9277a

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

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

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -407,15 +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-
// try (PrintWriter pw = context.terminal.writer()) {
412-
// pw.println(msg);
413-
// pw.flush(); fixme even with flush its not working, why?
414-
// }
415-
PrintWriter pw = context.terminal.writer();
416-
pw.println(msg);
417-
pw.flush();
418-
};
410+
return msg -> context.terminal.writer().println(msg);
419411
}
420412
}
421413

@@ -446,10 +438,8 @@ protected void activateLogging(C context) throws Exception {
446438
}
447439

448440
// at this point logging is set up, reply so far accumulated logs, if any and swap logger with real one
449-
Logger logger =
450-
new Slf4jLogger(context.loggerFactory.getLogger(getClass().getName()));
451-
context.logger.drain().forEach(e -> logger.log(e.level(), e.message(), e.error()));
452-
context.logger = logger;
441+
context.logger = new Slf4jLogger(context.loggerFactory.getLogger(getClass().getName()));
442+
context.logger.drain().forEach(e -> context.logger.log(e.level(), e.message(), e.error()));
453443
}
454444

455445
protected void helpOrVersionAndMayExit(C context) throws Exception {
@@ -720,10 +710,9 @@ protected Runnable settings(C context, boolean emitSettingsWarnings, SettingsBui
720710
};
721711
}
722712

723-
protected void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest)
724-
throws Exception {}
713+
protected abstract void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest) throws Exception;
725714

726-
protected void customizeSettingsResult(C context, SettingsBuilderResult settingsBuilderResult) throws Exception {}
715+
protected abstract void customizeSettingsResult(C context, SettingsBuilderResult settingsBuilderResult) throws Exception;
727716

728717
protected boolean mayDisableInteractiveMode(C context, boolean proposedInteractive) {
729718
if (!context.invokerRequest.options().forceInteractive().orElse(false)) {

impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,11 @@ void conflictingSettings(
206206
</settings>""";
207207
Path dotMvn = cwd.resolve(".mvn");
208208
Files.createDirectories(dotMvn);
209-
Path projectExtensions = dotMvn.resolve("settings.xml");
210-
Files.writeString(projectExtensions, settingsXml);
209+
Files.writeString(dotMvn.resolve("settings.xml"), settingsXml);
211210

212211
Path userConf = userHome.resolve(".m2");
213212
Files.createDirectories(userConf);
214-
Path userExtensions = userConf.resolve("settings.xml");
215-
Files.writeString(userExtensions, settingsXml);
213+
Files.writeString(userConf.resolve("settings.xml"), settingsXml);
216214

217215
// we just execute a Mojo for downloading it only and to assert from which URL it came
218216
Map<String, String> logs = invoke(

0 commit comments

Comments
 (0)