handling of missing arguments

Author: roman-la

file.out

@@ -1,30 +1,27 @@
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.MissingOptionException;
-import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.*;
 
 import osm.util.OpenSenseMapHandler;
 import util.Config;
 
 import java.io.IOException;
 
 public class Main {
-    public static void main(String[] args) throws ParseException, IOException {
+    public static void main(String[] args) {
 
         Config c = new Config();
+
         try {
             CommandLine config = c.parseArgs(args);
 
             if (config.hasOption("osm")) {
                 new OpenSenseMapHandler().handleConfig(config);
             } else {
-                System.out.println("No data source specified.");
-                System.out.println("Please refer to the README.");
+                System.out.println("No data source specified.\nPlease refer to the README.");
             }
-        } catch (MissingOptionException e) {
-            c.printHelp();
-        } catch (NullPointerException npe){
+        } catch (ParseException e) {
             c.printHelp();
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
 }

src/main/java/Main.java

@@ -1,9 +1,6 @@
 package osm.util;
 
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
 import org.eclipse.rdf4j.model.Statement;
 
 import osm.models.Location;
@@ -18,7 +15,6 @@
 public class OpenSenseMapHandler {
 
     public void handleConfig(CommandLine config) throws IOException {
-
         SenseBox senseBox = OpenSenseMapApi.getSenseBox(config.getOptionValue("osm"));
 
         List<Statement> statements = RdfConverter.convertSenseBoxToStatements(senseBox);

src/main/java/osm/util/OpenSenseMapHandler.java

@@ -18,19 +18,22 @@ public Config() {
                 .desc("Id of the SenseBox.")
                 .build());
 
-        options.addOption(Option.builder("measurements")
+        options.addOption(Option.builder("m")
+                .longOpt("measurements")
                 .required(false)
                 .hasArg(false)
                 .desc("Set if measurements and locations should get collected.")
                 .build());
 
-        options.addOption(Option.builder("locations")
+        options.addOption(Option.builder("l")
+                .longOpt("locations")
                 .required(false)
                 .hasArg(false)
                 .desc("Set if only locations should get collected.")
                 .build());
 
-        options.addOption(Option.builder("timerange")
+        options.addOption(Option.builder("t")
+                .longOpt("timerange")
                 .required(false)
                 .hasArg(true)
                 .numberOfArgs(2)
@@ -39,7 +42,8 @@ public Config() {
                 .desc("Time range in witch data gets collected. (Example: 2019-05-01T00:00:00.000Z 2019-05-15T00:00:00.000Z)")
                 .build());
 
-        options.addOption(Option.builder("path")
+        options.addOption(Option.builder("p")
+                .longOpt("path")
                 .required(true)
                 .hasArg(true)
                 .numberOfArgs(1)
@@ -58,5 +62,4 @@ public void printHelp() {
         HelpFormatter hf = new HelpFormatter();
         hf.printHelp("OSM to RDF Parser ", options);
     }
-
 }

src/main/java/util/Config.java

@@ -1,5 +1,6 @@
 package util;
 
+import org.apache.commons.cli.MissingArgumentException;
 import org.apache.commons.cli.UnrecognizedOptionException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -23,9 +24,20 @@ public void testParseArgs() {
     public void testParseArgsWithUnknownParameter() {
         String[] args = new String[]{
                 "-osm", "senseBoxId",
-                "-unknown", "valueOfUnknown"
+                "-unknown", "valueOfUnknown",
+                "-path", "file.out"
         };
 
         Assertions.assertThrows(UnrecognizedOptionException.class, () -> new Config().parseArgs(args));
     }
+
+    @Test
+    public void testParseArgsWithMissingArgument() {
+        String[] args = new String[]{
+                "-osm",
+                "-path", "file.out"
+        };
+
+        Assertions.assertThrows(MissingArgumentException.class, () -> new Config().parseArgs(args));
+    }
 }