summaryrefslogtreecommitdiffstats
path: root/auth/cli-editor/src
diff options
context:
space:
mode:
authorJvD_Ericsson <jeff.van.dam@est.tech>2020-08-06 10:00:32 +0100
committerJvD_Ericsson <jeff.van.dam@est.tech>2020-08-07 13:59:20 +0100
commitdc2b85e4ae6db95a0c09494a928ee6fbdf95594e (patch)
treed51499c785a2526d4f401b6d1e650cbae9ec7d38 /auth/cli-editor/src
parent56e4f452342da2d0a9e0fb822c68b3440476092a (diff)
Sonar Fixes
Replace the type specification in this constructor call with the diamond operator and other small fixes Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech> Issue-ID: POLICY-2760 Change-Id: I83821859a4a1dbbffbaeae15281abac2de3b5712
Diffstat (limited to 'auth/cli-editor/src')
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java1
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java16
-rw-r--r--auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java2
3 files changed, 9 insertions, 10 deletions
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
index cfe2077bc..3adea1a89 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineEditorLoop.java
@@ -257,7 +257,6 @@ public class CommandLineEditorLoop {
writer.println(e.getMessage());
executionStatus.setRight(executionStatus.getRight() + 1);
LOGGER.debug(COMMAND_LINE_ERROR, e);
- continue;
} catch (final Exception e) {
e.printStackTrace(writer);
LOGGER.error(COMMAND_LINE_ERROR, e);
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java
index 3eba53d2d..05066adb4 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParser.java
@@ -1,19 +1,20 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -22,6 +23,7 @@ package org.onap.policy.apex.auth.clieditor;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
/**
@@ -87,7 +89,7 @@ public class CommandLineParser {
/**
* This method merges the next set of quotes.
- *
+ *
* @param wordsSplitOnQuotes the words split on quotes
* @param wordsWithQuotesMerged the merged words
* @param wordIndex the current word index
@@ -240,7 +242,7 @@ public class CommandLineParser {
/**
* Strip and split a word on blanks into an array of words split on blanks.
- *
+ *
* @param word the word to split
* @return the array of split words
*/
@@ -257,9 +259,7 @@ public class CommandLineParser {
// Split on space characters
final String[] splitWords = singleSpaceWord.split(" ");
- for (final String splitWord : splitWords) {
- strippedAndSplitWords.add(splitWord);
- }
+ Collections.addAll(strippedAndSplitWords, splitWords);
return strippedAndSplitWords;
}
diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java
index ccf799047..a70439e10 100644
--- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java
+++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/utils/CliUtils.java
@@ -217,7 +217,7 @@ public class CliUtils {
if (argValue instanceof String && !key.equals("o")) {
cliArgsList.add("-" + key);
cliArgsList.add(argValue.toString());
- } else if (argValue instanceof Boolean && (Boolean) argValue) {
+ } else if (argValue instanceof Boolean && (boolean) argValue) {
cliArgsList.add("-" + key);
}
} catch (Exception e) {