From 5516fa539ccd2126d59b356e80146f103f3dd2a4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 16 Jun 2020 18:14:15 -0400 Subject: [PATCH 1/2] -f and -settings should not be mandatory as there are sensible defaults --- .../github/jelmerk/maven/settings/Decorder.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/github/jelmerk/maven/settings/Decorder.java b/src/main/java/org/github/jelmerk/maven/settings/Decorder.java index 884335d..bf3df45 100644 --- a/src/main/java/org/github/jelmerk/maven/settings/Decorder.java +++ b/src/main/java/org/github/jelmerk/maven/settings/Decorder.java @@ -28,7 +28,7 @@ public class Decorder { private static final String SETTINGS_FILE_LONG_OPT = "settings"; private static final String SETTINGS_FILE_SHORT_OPT = "f"; - private static final int MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE = 1; + private static final int INVALID_ARGUMENTS_EXIT_CODE = 1; public static void main(String... args) throws Exception { @@ -37,26 +37,21 @@ public static void main(String... args) throws Exception { CommandLineParser parser = new PosixParser(); CommandLine commandLine = parser.parse(options, args); - String settingsFileName = commandLine.getOptionValue(SETTINGS_FILE_SHORT_OPT); - String securityFileName = commandLine.getOptionValue(SETTINGS_SECURITY_FILE_SHORT_OPT); - - if (settingsFileName == null || securityFileName == null) { - printHelp(options); - System.exit(MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE); - } + String settingsFileName = commandLine.getOptionValue(SETTINGS_FILE_SHORT_OPT, System.getProperty("user.home") + File.separatorChar + ".m2" + File.separatorChar + "settings.xml"); + String securityFileName = commandLine.getOptionValue(SETTINGS_SECURITY_FILE_SHORT_OPT, System.getProperty("user.home") + File.separatorChar + ".m2" + File.separatorChar + "settings-security.xml"); File settingsFile = new File(settingsFileName); if (!settingsFile.exists()) { System.out.printf("Settings file : %s does not exist%n", settingsFile.getAbsolutePath()); - System.exit(MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE); + System.exit(INVALID_ARGUMENTS_EXIT_CODE); } File securityFile = new File(securityFileName); if (!settingsFile.exists()) { System.out.printf("Security file : %s does not exist%n", securityFile.getAbsolutePath()); - System.exit(MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE); + System.exit(INVALID_ARGUMENTS_EXIT_CODE); } printPasswords(settingsFile, securityFile); From 88ca37fbf7de18b1e864358b8e09794d921e73ae Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 16 Jun 2020 18:18:07 -0400 Subject: [PATCH 2/2] Unused code --- src/main/java/org/github/jelmerk/maven/settings/Decoder.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/github/jelmerk/maven/settings/Decoder.java b/src/main/java/org/github/jelmerk/maven/settings/Decoder.java index 4113391..48f421f 100644 --- a/src/main/java/org/github/jelmerk/maven/settings/Decoder.java +++ b/src/main/java/org/github/jelmerk/maven/settings/Decoder.java @@ -82,11 +82,6 @@ private static Options createOptions() { return options; } - private static void printHelp(Options options) { - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("settings-decoder", options); - } - private static void printPasswords(File settingsFile, File securityFile) throws IOException, XmlPullParserException, SecDispatcherException, PlexusCipherException {