Bump HAM dependency to 1.3.0, replace '-json' and '-simple-json' flags with '-full-json' and '-json' (respectively)

Author: tylercamp

pom.xml

@@ -80,12 +80,12 @@
         <dependency>
             <groupId>com.github.secdec.astam-correlator</groupId>
             <artifactId>threadfix-entities</artifactId>
-            <version>1.2.18</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.secdec.astam-correlator</groupId>
             <artifactId>threadfix-ham</artifactId>
-            <version>1.2.18</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.owasp</groupId>

src/com/denimgroup/threadfix/cli/endpoints/EndpointMain.java

@@ -303,9 +303,9 @@ private static boolean checkArguments(String[] args) {
                 } else if (arg.equals("-lint")) {
                     printFormat = Endpoint.PrintFormat.LINT;
                 } else if (arg.equals("-json")) {
-                    printFormat = FULL_JSON;
-                } else if (arg.equals("-simple-json")) {
                     printFormat = SIMPLE_JSON;
+                } else if (arg.equals("-full-json")) {
+                    printFormat = FULL_JSON;
                 } else if (arg.contains(FRAMEWORK_COMMAND)) {
                     String frameworkName = arg.substring(arg.indexOf(
                             FRAMEWORK_COMMAND) + FRAMEWORK_COMMAND.length(), arg.length());
@@ -357,9 +357,11 @@ private static boolean checkArguments(String[] args) {
                             }
                         }
                     }
-
+                } else if (arg.equalsIgnoreCase("-help")) {
+                    printHelp();
+                    return false;
                 } else {
-                    println("Received unsupported option " + arg + ", valid arguments are -lint, -debug, -simple-json, -json, -path-list-file, and -simple");
+                    println("Received unsupported option " + arg + ", run with -help to see available flags.");
                     return false;
                 }
             }
@@ -374,7 +376,15 @@ private static boolean checkArguments(String[] args) {
     }
 
     static void printError() {
-        println("The first argument should be a valid file path to scan. Other flags supported: -lint, -debug, -simple-json, -json, -path-list-file=..., -output-file=..., -simple");
+        println("The first argument should be a valid file path to scan. Run with -help to see available flags and usage.");
+    }
+
+    static void printHelp() {
+        StringBuilder helpMessage = new StringBuilder();
+
+        helpMessage.append("Attack Surface Detector CLI Tool");
+
+        println(helpMessage.toString());
     }
 
     private static int printEndpointWithVariants(int i, int currentDepth, Endpoint endpoint) {