Code hardening for Ansible Bundle

[appc.git] / appc-adapters / appc-ansible-adapter / appc-ansible-adapter-bundle / src / main / java / org / onap / appc / adapter / ansible / model / AnsibleResultCodes.java

diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/model/AnsibleResultCodes.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/model/AnsibleResultCodes.java
index 5d44f6d..bcc7765 100644 (file)
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/model/AnsibleResultCodes.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/model/AnsibleResultCodes.java
@@ -9,35 +9,38 @@
  * 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.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
 package org.onap.appc.adapter.ansible.model;
 
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * enum of the various codes that APP-C uses to resolve different
- *  status of response from Ansible Server
+ * status of response from Ansible Server
  **/
 
-public enum AnsibleResultCodes{
+public enum AnsibleResultCodes {
 
+    // @formatter:off
     SUCCESS(400),
     KEYSTORE_EXCEPTION(622),
     CERTIFICATE_ERROR(610),
-    IO_EXCEPTION (611),
+    IO_EXCEPTION(611),
     HOST_UNKNOWN(625),
     USER_UNAUTHORIZED(613),
     UNKNOWN_EXCEPTION(699),
@@ -51,72 +54,40 @@ public enum AnsibleResultCodes{
     MESSAGE(1),
     CODE(0),
     INITRESPONSE(0),
-    FINALRESPONSE(1); 
-    
-    private final Set<Integer> initCodes = new HashSet<Integer>(Arrays.asList(100, 101));
-    private final Set<Integer> finalCodes = new HashSet<Integer>(Arrays.asList(200, 500));
-    private final ArrayList<Set<Integer>>codeSets = new ArrayList<Set<Integer>>(Arrays.asList(initCodes, finalCodes));
-    
-    private  final Set<String> MessageSet = new HashSet<String>(Arrays.asList("PENDING", "FINISHED", "TERMINATED"));
+    FINALRESPONSE(1);
+    // @formatter:on
 
+    private final Set<Integer> initCodes = new HashSet<>(Arrays.asList(100, 101));
+    private final Set<Integer> finalCodes = new HashSet<>(Arrays.asList(200, 500));
+    private final ArrayList<Set<Integer>> codeSets = new ArrayList<>(Arrays.asList(initCodes, finalCodes));
+    private final Set<String> messageSet = new HashSet<>(Arrays.asList("PENDING", "FINISHED", "TERMINATED"));
     private final int value;
-    
-    AnsibleResultCodes(int value){
-       this.value = value;
-    };
 
+    AnsibleResultCodes(int value) {
+        this.value = value;
+    };
 
-    public int getValue(){
-       return this.value;
+    public int getValue() {
+        return value;
     }
 
-
-    public boolean checkValidCode(int Type, int Code){
-       Set<Integer>CodeSet = codeSets.get(Type);
-       if (CodeSet.contains(Code)){
-           return true;
-       }
-       else{
-           return false;
-       }
+    public boolean checkValidCode(int type, int code) {
+        return codeSets.get(type).contains(code);
     }
 
-
-    public String getValidCodes(int Type){
-       Set<Integer>CodeSet = codeSets.get(Type);
-       
-       Iterator iter = CodeSet.iterator();
-       String ValidCodes = "[ ";
-       while(iter.hasNext()){
-           ValidCodes = ValidCodes +  iter.next().toString() + ",";
-       }
-
-       ValidCodes = ValidCodes + "]";
-       return ValidCodes;
+    public String getValidCodes(int type) {
+        StringBuilder sb = new StringBuilder("[ ");
+        codeSets.get(type).stream().forEach(s -> sb.append(s).append(","));
+        return sb.append("]").toString();
     }
 
-
-    public boolean checkValidMessage(String Message){
-       if (MessageSet.contains(Message)){
-           return true;
-       }
-       else{
-           return false;
-       }
+    public boolean checkValidMessage(String message) {
+        return messageSet.contains(message);
     }
 
-
-
-    public String getValidMessages(){
-       Iterator iter = MessageSet.iterator();
-       String ValidMessage = "[ ";
-       while(iter.hasNext()){
-           ValidMessage = ValidMessage +  iter.next() + ",";
-       }
-
-       ValidMessage = ValidMessage + "]";
-       return ValidMessage;
+    public String getValidMessages() {
+        StringBuilder sb = new StringBuilder("[ ");
+        messageSet.stream().forEach(s -> sb.append(s).append(","));
+        return sb.append("]").toString();
     }
-
-
-};
+}