Remove the apache commons-lang dependency in aai-common

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / restcore / JettyObfuscationConversionCommandLineUtil.java

diff --git a/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java b/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java
index 920a85a..f59dba4 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.restcore;
 
-import org.apache.commons.cli.BasicParser;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.eclipse.jetty.util.security.Password;
@@ -49,50 +48,50 @@ import org.eclipse.jetty.util.security.Password;
  * the-secret-to-hide-the-secret problem.
  */
 public class JettyObfuscationConversionCommandLineUtil {
-       
-       /**
-        * The main method.
-        *
-        * @param args the arguments
-        */
-       public static void main(String[] args){
-               Options options = new Options();
-               options.addOption("e", true, "obfuscate the given string");
-               options.addOption("d", true, "deobfuscate the given string");
-               
-               CommandLineParser parser = new BasicParser();
-               
-               try {
-                       CommandLine cmd = parser.parse(options, args);
-                       String toProcess = null;
-                       
-                       if (cmd.hasOption("e")){
-                               toProcess = cmd.getOptionValue("e");
-                               String encoded = Password.obfuscate(toProcess);
-                               System.out.println(encoded);
-                       } else if (cmd.hasOption("d")) {
-                               toProcess = cmd.getOptionValue("d");
-                               String decoded_str = Password.deobfuscate(toProcess);
-                               System.out.println(decoded_str);
-                       } else {
-                               usage();
-                       }
-               } catch (ParseException e) {
-                       System.out.println("failed to parse input");
-                       System.out.println(e.toString());
-                       usage();
-               } catch (Exception e) {
-                       System.out.println("exception:" + e.toString());
-               }
-       }
-       
-       /**
-        * Usage.
-        */
-       private static void usage(){
-               System.out.println("usage:");;
-               System.out.println("-e [string] to obfuscate");
-               System.out.println("-d [string] to deobfuscate");
-               System.out.println("-h help");
-       }
+
+    /**
+     * The main method.
+     *
+     * @param args the arguments
+     */
+    public static void main(String[] args) {
+        Options options = new Options();
+        options.addOption("e", true, "obfuscate the given string");
+        options.addOption("d", true, "deobfuscate the given string");
+
+        CommandLineParser parser = new DefaultParser();
+
+        try {
+            CommandLine cmd = parser.parse(options, args);
+            String toProcess = null;
+
+            if (cmd.hasOption("e")) {
+                toProcess = cmd.getOptionValue("e");
+                String encoded = Password.obfuscate(toProcess);
+                System.out.println(encoded);
+            } else if (cmd.hasOption("d")) {
+                toProcess = cmd.getOptionValue("d");
+                String decoded_str = Password.deobfuscate(toProcess);
+                System.out.println(decoded_str);
+            } else {
+                usage();
+            }
+        } catch (ParseException e) {
+            System.out.println("failed to parse input");
+            System.out.println(e.toString());
+            usage();
+        } catch (Exception e) {
+            System.out.println("exception:" + e.toString());
+        }
+    }
+
+    /**
+     * Usage.
+     */
+    private static void usage() {
+        System.out.println("usage:");
+        System.out.println("-e [string] to obfuscate");
+        System.out.println("-d [string] to deobfuscate");
+        System.out.println("-h help");
+    }
 }