Removed thed use of deprecated "readFileToString"

[cli.git] / main / src / main / java / org / onap / cli / main / utils / OnapCliArgsParser.java

diff --git a/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java b/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java
index 174dfd2..53e9066 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java
+++ b/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java
@@ -19,6 +19,7 @@ package org.onap.cli.main.utils;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -99,8 +100,7 @@ public class OnapCliArgsParser {
         }
 
         int positionalIdx = 0;
-        int i = 0;
-        while ( i < args.size()) {
+        for (int i = 0; i < args.size(); i++) {
             String paramName = null;
             if (shortOptionMap.containsKey(args.get(i))) {
                 paramName = shortOptionMap.get(args.get(i));
@@ -113,7 +113,6 @@ public class OnapCliArgsParser {
                 if ((i + 1) == args.size() || args.get(i + 1).startsWith("-")) {
                     if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.BOOL)) {
                         paramMap.get(paramName).setValue(true);
-                        i+=2;
                         continue;
                     }
                     throw new OnapCliArgumentValueMissing(args.get(i));
@@ -122,26 +121,26 @@ public class OnapCliArgsParser {
                 if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.JSON)) {
                     paramMap.get(paramName).setValue(readJsonStringFromUrl(args.get(i + 1),
                             paramMap.get(paramName).getName()));
-                    i+=2;
+                    i++;
                     continue;
 
                 } else if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.TEXT)) {
                     paramMap.get(paramName).setValue(readTextStringFromUrl(args.get(i + 1),
                             paramMap.get(paramName).getName()));
-                    i+=2;
+                    i++;
                     continue;
 
                 } else if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.YAML)) {
                     String value = readYamlStringFromUrl(args.get(i + 1),
                             paramMap.get(paramName).getName());
                     paramMap.get(paramName).setValue(value);
-                    i+=2;
+                    i++;
                     continue;
 
                 } else if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.BYTE)) {
                     paramMap.get(paramName).setValue(readBytesFromUrl(args.get(i + 1),
                             paramMap.get(paramName).getName()));
-                    i+=2;
+                    i++;
                     continue;
 
                 } else if (paramMap.get(paramName).getParameterType()
@@ -151,7 +150,7 @@ public class OnapCliArgsParser {
 
                     list.add(readTextStringFromUrl(args.get(i + 1), paramMap.get(paramName).getName()));
                     paramMap.get(paramName).setValue(list);
-                    i+=2;
+                    i++;
                     continue;
 
                 } else if (paramMap.get(paramName).getParameterType()
@@ -173,13 +172,13 @@ public class OnapCliArgsParser {
                     //map.put(argArr[0], readTextStringFromUrl(argArr[1], paramMap.get(paramName).getName()));
                     map.put(argArr[0], argArr[1]);
                     paramMap.get(paramName).setValue(map);
-                    i+=2;
+                    i++;
                     continue;
                 }
 
                 paramMap.get(paramName).setValue(args.get(i + 1));
 
-                i+=2;
+                i++;
                 continue;
             }
 
@@ -193,7 +192,6 @@ public class OnapCliArgsParser {
 
             paramMap.get(positionArgs.get(positionalIdx)).setValue(args.get(i));
             positionalIdx++;
-            i+=2;
         }
 
         params.clear();
@@ -227,7 +225,7 @@ public class OnapCliArgsParser {
         try {
             File file = new File(input);
             if (file.isFile()) {
-                return FileUtils.readFileToString(file);
+                return FileUtils.readFileToString(file, (Charset) null);
             } else {
                 return input;
             }
@@ -241,7 +239,7 @@ public class OnapCliArgsParser {
         try {
             File file = new File(input);
             if (file.isFile()) {
-                String value = FileUtils.readFileToString(file);
+                String value = FileUtils.readFileToString(file, (Charset) null);
                 YamlReader reader = new YamlReader(value);
                 value = (String) reader.read();
                 return value;