Reformat and clean up ChefAdapterImpl.java

Fix some Sonar issues
Update code to ONAP java style

Issue-ID: APPC-419
Change-Id: I0c6b7b684c10b3874c3ef7de40066eb6c3b6345e
Signed-off-by: Skip Wonnell <skip@att.com>

1 files changed, 345 insertions, 426 deletions

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
index 8307a9b99..9b224fc81 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
@@ -9,19 +9,18 @@
  * 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.chef.impl;
 
 import java.io.File;
@@ -29,27 +28,20 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.appc.Constants;
 import org.onap.appc.adapter.chef.ChefAdapter;
 import org.onap.appc.adapter.chef.chefapi.ApiMethod;
 import org.onap.appc.adapter.chef.chefclient.ChefApiClient;
-import org.onap.appc.configuration.Configuration;
-import org.onap.appc.configuration.ConfigurationFactory;
-import org.onap.appc.exceptions.APPCException;                                                
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
@@ -59,12 +51,12 @@ import com.att.eelf.configuration.EELFManager;
  */
 public class ChefAdapterImpl implements ChefAdapter {
     // chef server Initialize variable
-    private String username = "";
-    private String clientPrivatekey = "";
-    private String chefserver = "";
-    private String serverAddress = "";
-    private String organizations = "";
-    
+    private String username = StringUtils.EMPTY;
+    private String clientPrivatekey = StringUtils.EMPTY;
+    private String chefserver = StringUtils.EMPTY;
+    private String serverAddress = StringUtils.EMPTY;
+    private String organizations = StringUtils.EMPTY;
+
     @SuppressWarnings("nls")
     public static final String MDC_ADAPTER = "adapter";
 
@@ -104,21 +96,8 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(ChefAdapterImpl.class);
 
-    private static final char LPAREN = '(';
-
-    private static final char NL = '\n';
-
-    private static final char QUOTE = '\'';
-
-    private static final char RPAREN = ')';
-    private static final char SPACE = ' ';
-
-    private final String CANNOT_FIND_PRIVATE_KEY_STR = "Cannot find the private key in the APPC file system, please load the private key to ";
-   
-    /**
-     * A reference to the adapter configuration object.
-     */
-    private Configuration configuration;
+    private static final String CANNOT_FIND_PRIVATE_KEY_STR =
+            "Cannot find the private key in the APPC file system, please load the private key to ";
 
     /**
      * This default constructor is used as a work around because the activator wasnt
@@ -127,10 +106,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     public ChefAdapterImpl() {
         initialize();
     }
-    
+
     public ChefAdapterImpl(Properties props) {
         initialize();
-
     }
 
     /**
@@ -138,11 +116,10 @@ public class ChefAdapterImpl implements ChefAdapter {
      * of the adapter for isolated, disconnected testing
      *
      * @param initialize
-     *            True if the adapter is to be initialized, can false if not
+     *        True if the adapter is to be initialized, can false if not
      */
-     
+
     public ChefAdapterImpl(boolean initialize) {
-       
         if (initialize) {
             initialize();
         }
@@ -152,8 +129,6 @@ public class ChefAdapterImpl implements ChefAdapter {
         initialize();
     }
 
-    
-    
     /**
      * Returns the symbolic name of the adapter
      *
@@ -165,58 +140,55 @@ public class ChefAdapterImpl implements ChefAdapter {
         return "chef adapter";
     }
 
-   @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     @Override
     public void VnfcEnvironment(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         int code;
-        try{
-        logger.info("environment of VNF-C");
-        chefInfo(params,ctx);
-        RequestContext rc = new RequestContext(ctx);
-        logger.info("Context"+ctx );
-        rc.isAlive();     
-        String env = params.get("Environment");
-         logger.info("Environmnet"+env );
-        if(env.equals("")){
-            chefServerResult(rc, "200", "Skip Environment block ");}
-        else{
-        JSONObject env_J = new JSONObject(env);
-        String envName = env_J.getString("name");
-        
-    
-        String message = null;
-        if (privateKeyCheck()) {
-            // update the details of an environment on the Chef server.
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-            ApiMethod am = cac.put("/environments/"+envName).body(env);
-            am.execute();
-            code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
-                if(code == 404 ){
-                    //need create a new environment
-                    am = cac.post("/environments").body(env);
+        try {
+            logger.info("environment of VNF-C");
+            chefInfo(params, ctx);
+            RequestContext rc = new RequestContext(ctx);
+            logger.info("Context" + ctx);
+            rc.isAlive();
+            String env = params.get("Environment");
+            logger.info("Environmnet" + env);
+            if (env.equals(StringUtils.EMPTY)) {
+                chefServerResult(rc, "200", "Skip Environment block ");
+            } else {
+                JSONObject env_J = new JSONObject(env);
+                String envName = env_J.getString("name");
+                String message = null;
+                if (privateKeyCheck()) {
+                    // update the details of an environment on the Chef server.
+                    ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+                    ApiMethod am = cac.put("/environments/" + envName).body(env);
                     am.execute();
                     code = am.getReturnCode();
                     message = am.getResponseBodyAsString();
-                    logger.info("requestbody"+am.getReqBody());
-                }
+                    if (code == 404) {
+                        // need create a new environment
+                        am = cac.post("/environments").body(env);
+                        am.execute();
+                        code = am.getReturnCode();
+                        message = am.getResponseBodyAsString();
+                        logger.info("requestbody" + am.getReqBody());
+                    }
 
-        } else {
-            code = 500;
-            message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
-            doFailure(ctx,code,message);
-        }
-        chefServerResult(rc, Integer.toString(code), message);
-        }
+                } else {
+                    code = 500;
+                    message = "Cannot find the private key in the APPC file system, please load the private key to "
+                            + clientPrivatekey;
+                    doFailure(ctx, code, message);
+                }
+                chefServerResult(rc, Integer.toString(code), message);
+            }
         }
-        
-        catch(JSONException e){
-            code =401;
+
+        catch (JSONException e) {
+            code = 401;
             doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-        }
-        catch(Exception e){
-            code =401;
+        } catch (Exception e) {
+            code = 401;
             doFailure(ctx, code, "Error posting request :Reason = " + e.getMessage());
         }
     }
@@ -226,233 +198,198 @@ public class ChefAdapterImpl implements ChefAdapter {
     public void VnfcNodeobjects(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         logger.info("update the nodeObjects of VNF-C");
         int code;
-        try{
-        chefInfo(params,ctx);
-        String nodeList_S = params.get("NodeList");
-        String node_S = params.get("Node");
-        if (StringUtils.isNotBlank(nodeList_S) && StringUtils.isNotBlank(node_S))
-        {
-        nodeList_S = nodeList_S.replace("[","");
-        nodeList_S = nodeList_S.replace("]","");
-        nodeList_S = nodeList_S.replace("\"","");
-        nodeList_S = nodeList_S.replace(" ","");
-        List<String> nodes = Arrays.asList(nodeList_S.split("\\s*,\\s*"));
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        code=200;
-        String message = null;
-        if (privateKeyCheck()) {
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-
-            for(int i = 0; i < nodes.size(); i++){
-                String nodeName=nodes.get(i);
-                JSONObject node_J = new JSONObject(node_S);
-                node_J.remove("name");
-                node_J.put("name",nodeName);
-                String nodeObject=node_J.toString();
-                logger.info(nodeObject);
-                ApiMethod am = cac.put("/nodes/"+nodeName).body(nodeObject);
-                am.execute();
-                code = am.getReturnCode();
-                message = am.getResponseBodyAsString();
-                if(code != 200){
-                    break;
+        try {
+            chefInfo(params, ctx);
+            String nodeList_S = params.get("NodeList");
+            String node_S = params.get("Node");
+            if (StringUtils.isNotBlank(nodeList_S) && StringUtils.isNotBlank(node_S)) {
+                nodeList_S = nodeList_S.replace("[", StringUtils.EMPTY);
+                nodeList_S = nodeList_S.replace("]", StringUtils.EMPTY);
+                nodeList_S = nodeList_S.replace("\"", StringUtils.EMPTY);
+                nodeList_S = nodeList_S.replace(" ", StringUtils.EMPTY);
+                List<String> nodes = Arrays.asList(nodeList_S.split("\\s*,\\s*"));
+                RequestContext rc = new RequestContext(ctx);
+                rc.isAlive();
+                code = 200;
+                String message = null;
+                if (privateKeyCheck()) {
+                    ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+
+                    for (int i = 0; i < nodes.size(); i++) {
+                        String nodeName = nodes.get(i);
+                        JSONObject node_J = new JSONObject(node_S);
+                        node_J.remove("name");
+                        node_J.put("name", nodeName);
+                        String nodeObject = node_J.toString();
+                        logger.info(nodeObject);
+                        ApiMethod am = cac.put("/nodes/" + nodeName).body(nodeObject);
+                        am.execute();
+                        code = am.getReturnCode();
+                        message = am.getResponseBodyAsString();
+                        if (code != 200) {
+                            break;
+                        }
+                    }
+                } else {
+                    code = 500;
+                    message = "Cannot find the private key in the APPC file system, please load the private key to "
+                            + clientPrivatekey;
+                    doFailure(ctx, code, message);
                 }
-
+                chefServerResult(rc, Integer.toString(code), message);
             }
-        }else{
-            code = 500;
-            message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
-            doFailure(ctx,code,message);
+            else {
+                throw new SvcLogicException("Missing Mandatory param(s) Node , NodeList ");
             }
-        chefServerResult(rc, Integer.toString(code), message);
-        }
-        
-        else
-        {
-            throw new SvcLogicException("Missing Mandatory param(s) Node , NodeList ");
-        }
-    }
-        catch(JSONException e){
-            code =401;
+        } catch (JSONException e) {
+            code = 401;
             doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-        }
-        catch(Exception ex){
-            code =401;
+        } catch (Exception ex) {
+            code = 401;
             doFailure(ctx, code, "Error posting request :Reason = " + ex.getMessage());
         }
-        
     }
 
     @Override
     public void VnfcPushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        int code ;
-    try{
-        chefInfo(params,ctx);
-        String nodeList = params.get("NodeList");
-        if (StringUtils.isNotBlank(nodeList))
-        {
-        String isCallback = params.get("CallbackCapable");
-        String chefAction = "/pushy/jobs";
-        //need work on this
-        String pushRequest="";
-        if(isCallback.equals("true")){
-            String requestId = params.get("RequestId");
-            String callbackUrl = params.get("CallbackUrl");
-            pushRequest="{"+
-                      "\"command\": \"chef-client\","+
-                      "\"run_timeout\": 300,"+
-                      "\"nodes\":" +nodeList +","+
-                      "\"env\": {\"RequestId\": \""+ requestId +"\", \"CallbackUrl\": \""+ callbackUrl +"\"},"+
-                      "\"capture_output\": true"+
-                    "}";
-        }else{
-            pushRequest="{"+
-                  "\"command\": \"chef-client\","+
-                  "\"run_timeout\": 300,"+
-                  "\"nodes\":" +nodeList +","+
-                  "\"env\": {},"+
-                  "\"capture_output\": true"+
-                "}";
-        }
-        RequestContext rc = new RequestContext(ctx);
+        int code;
+        try {
+            chefInfo(params, ctx);
+            String nodeList = params.get("NodeList");
+            if (StringUtils.isNotBlank(nodeList)) {
+                String isCallback = params.get("CallbackCapable");
+                String chefAction = "/pushy/jobs";
+                // need work on this
+                String pushRequest = StringUtils.EMPTY;
+                if (isCallback.equals("true")) {
+                    String requestId = params.get("RequestId");
+                    String callbackUrl = params.get("CallbackUrl");
+                    pushRequest = "{" + "\"command\": \"chef-client\"," + "\"run_timeout\": 300," + "\"nodes\":"
+                            + nodeList + "," + "\"env\": {\"RequestId\": \"" + requestId + "\", \"CallbackUrl\": \""
+                            + callbackUrl + "\"}," + "\"capture_output\": true" + "}";
+                } else {
+                    pushRequest = "{" + "\"command\": \"chef-client\"," + "\"run_timeout\": 300," + "\"nodes\":"
+                            + nodeList + "," + "\"env\": {}," + "\"capture_output\": true" + "}";
+                }
+                RequestContext rc = new RequestContext(ctx);
 
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-        ApiMethod am = cac.post(chefAction).body(pushRequest);
-
-        am.execute();
-         code = am.getReturnCode();
-         logger.info("pushRequest:"+pushRequest);
-         logger.info("requestbody:"+am.getReqBody()); 
-        
-        String message = am.getResponseBodyAsString();
-        if (code == 201) {
-            int startIndex = message.indexOf("jobs") + 5;
-            int endIndex = message.length() - 2;
-            String jobID = message.substring(startIndex, endIndex);
-            svcLogic.setAttribute("jobID", jobID);
-            logger.info(jobID);
-        }
-        chefServerResult(rc, Integer.toString(code), message);
-    }
-    
-    else
-    {
-        throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
-    }
-    }
-    catch(JSONException e){
-        code =401;
-        doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-    }
-        catch(Exception e)
-        {
+                rc.isAlive();
+                SvcLogicContext svcLogic = rc.getSvcLogicContext();
+                ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+                ApiMethod am = cac.post(chefAction).body(pushRequest);
+                am.execute();
+                code = am.getReturnCode();
+                logger.info("pushRequest:" + pushRequest);
+                logger.info("requestbody:" + am.getReqBody());
+                String message = am.getResponseBodyAsString();
+                if (code == 201) {
+                    int startIndex = message.indexOf("jobs") + 5;
+                    int endIndex = message.length() - 2;
+                    String jobID = message.substring(startIndex, endIndex);
+                    svcLogic.setAttribute("jobID", jobID);
+                    logger.info(jobID);
+                }
+                chefServerResult(rc, Integer.toString(code), message);
+            }
+            else {
+                throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
+            }
+        } catch (JSONException e) {
+            code = 401;
+            doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
+        } catch (Exception e) {
             code = 401;
-            doFailure(ctx,code,e.getMessage());
+            doFailure(ctx, code, e.getMessage());
         }
-        
     }
 
-
     @SuppressWarnings("nls")
     @Override
-    public void fetchResults (Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+    public void fetchResults(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         int code;
-        try{
-        chefInfo(params,ctx);
-        String nodeList_S = params.get("NodeList");
-        if (StringUtils.isNotBlank(nodeList_S) )
-        {
-        nodeList_S = nodeList_S.replace("[","");
-        nodeList_S = nodeList_S.replace("]","");
-        nodeList_S = nodeList_S.replace("\"","");
-        nodeList_S = nodeList_S.replace(" ","");
-        List<String> nodes = Arrays.asList(nodeList_S.split("\\s*,\\s*"));
-        JSONObject Result = new JSONObject();
-        String returnCode= "200";
-        String returnMessage="";
-        for (int i = 0; i < nodes.size(); i++){
-            String node=nodes.get(i);
-            String chefAction="/nodes/"+node;
-            
-            String message = null;
-            if (privateKeyCheck()) {
-                ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-                ApiMethod am = cac.get(chefAction);
-                am.execute();
-                code = am.getReturnCode();
-                message = am.getResponseBodyAsString();
-            } else {
-                code = 500;
-                message = "Cannot find the private key in the APPC file system, please load the private key to "
-                        + clientPrivatekey;
-                doFailure(ctx,code,message);
-            }
-            if (code==200){
-                JSONObject nodeResult = new JSONObject();
-                JSONObject allNodeData = new JSONObject(message);
-                 allNodeData=allNodeData.getJSONObject("normal");
-                    String attribute= "PushJobOutput";
-                    String resultData;
-
-                    try {
-                        resultData = allNodeData.getString(attribute);
-                    } catch (Exception exc1) {
+        try {
+            chefInfo(params, ctx);
+            String nodeList_S = params.get("NodeList");
+            if (StringUtils.isNotBlank(nodeList_S)) {
+                nodeList_S = nodeList_S.replace("[", StringUtils.EMPTY);
+                nodeList_S = nodeList_S.replace("]", StringUtils.EMPTY);
+                nodeList_S = nodeList_S.replace("\"", StringUtils.EMPTY);
+                nodeList_S = nodeList_S.replace(" ", StringUtils.EMPTY);
+                List<String> nodes = Arrays.asList(nodeList_S.split("\\s*,\\s*"));
+                JSONObject Result = new JSONObject();
+                String returnCode = "200";
+                String returnMessage = StringUtils.EMPTY;
+
+                for (int i = 0; i < nodes.size(); i++) {
+                    String node = nodes.get(i);
+                    String chefAction = "/nodes/" + node;
+                    String message = null;
+                    if (privateKeyCheck()) {
+                        ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+                        ApiMethod am = cac.get(chefAction);
+                        am.execute();
+                        code = am.getReturnCode();
+                        message = am.getResponseBodyAsString();
+                    } else {
+                        code = 500;
+                        message = "Cannot find the private key in the APPC file system, please load the private key to "
+                                + clientPrivatekey;
+                        doFailure(ctx, code, message);
+                    }
+                    if (code == 200) {
+                        JSONObject nodeResult = new JSONObject();
+                        JSONObject allNodeData = new JSONObject(message);
+                        allNodeData = allNodeData.getJSONObject("normal");
+                        String attribute = "PushJobOutput";
+                        String resultData;
                         try {
-                            resultData = allNodeData.getJSONObject(attribute).toString();
-                        } catch (Exception exc2) {
+                            resultData = allNodeData.getString(attribute);
+                        } catch (Exception exc1) {
                             try {
-                                resultData = allNodeData.getJSONArray(attribute).toString();
-                            }catch (Exception exc3){
-                                returnCode = "500";
-                                returnMessage="cannot find "+attribute;
-                                break;
+                                resultData = allNodeData.getJSONObject(attribute).toString();
+                            } catch (Exception exc2) {
+                                try {
+                                    resultData = allNodeData.getJSONArray(attribute).toString();
+                                } catch (Exception exc3) {
+                                    returnCode = "500";
+                                    returnMessage = "cannot find " + attribute;
+                                    break;
+                                }
                             }
                         }
+                        nodeResult.put(attribute, resultData);
+                        Result.put(node, nodeResult);
+                    } else {
+                        returnCode = "500";
+                        returnMessage = message + " Cannot access: " + node;
+                        doFailure(ctx, code, message);
+                        break;
                     }
-                    nodeResult.put(attribute,resultData);
-
-                Result.put(node,nodeResult);
-            }else{
-                returnCode="500";
-                returnMessage = message+" Cannot access: "+ node;
-                doFailure(ctx,code,message);
-                break;
+                }
+                RequestContext rc = new RequestContext(ctx);
+                rc.isAlive();
+                if (!returnCode.equals("500")) {
+                    returnMessage = Result.toString();
+                    returnCode = "200";
+                }
+                chefServerResult(rc, returnCode, returnMessage);
             }
-
-        }
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        if (!returnCode.equals("500")){
-            returnMessage=Result.toString();
-            returnCode="200";
-        }
-        chefServerResult(rc, returnCode, returnMessage);
-        }
-        
-        else
-        {
-            throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
-        }
-    }
-        catch(JSONException e){
-            code =401;
+            else {
+                throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
+            }
+        } catch (JSONException e) {
+            code = 401;
             doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-        }
-        catch(Exception ex){
-            code =401;
+        } catch (Exception ex) {
+            code = 401;
             doFailure(ctx, code, "Error posting request :Reason = " + ex.getMessage());
         }
-        
     }
 
     /**
      * build node object
      */
-     @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     @Override
     public void nodeObejctBuilder(Map<String, String> params, SvcLogicContext ctx) {
         logger.info("nodeObejctBuilder");
@@ -467,7 +404,6 @@ public class ChefAdapterImpl implements ChefAdapter {
                 + "},\"normal\": {" + normal + "},\"automatic\":{},\"name\":\"" + name + "\",\"chef_environment\":\""
                 + chefEnvironment + "\"}";
         logger.info(nodeObject);
-
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
@@ -476,41 +412,36 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     /**
      * send get request to chef server
-     * @throws SvcLogicException 
+     * 
+     * @throws SvcLogicException
      */
-    public void chefInfo(Map<String, String> params,SvcLogicContext ctx) throws SvcLogicException  {
-        
-      username = params.get("username");
+    public void chefInfo(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+
+        username = params.get("username");
         serverAddress = params.get("serverAddress");
         organizations = params.get("organizations");
-        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(serverAddress)&& StringUtils.isNotBlank(organizations))
-        {
-        chefserver = "https://" + serverAddress + "/organizations/" + organizations;
-        clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem";
-                logger.info( " clientPrivatekey  " + clientPrivatekey);
-        }
-        else 
-        {    
-        String    message ="Missing mandatory param(s) such as username,serverAddres,organizations";
-            doFailure(ctx,401,message);        
-            
+        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(serverAddress)
+                && StringUtils.isNotBlank(organizations)) {
+            chefserver = "https://" + serverAddress + "/organizations/" + organizations;
+            clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem";
+            logger.info(" clientPrivatekey  " + clientPrivatekey);
+        } else {
+            String message = "Missing mandatory param(s) such as username,serverAddres,organizations";
+            doFailure(ctx, 401, message);
         }
-        
-
     }
 
     public Boolean privateKeyCheck() {
         File f = new File(clientPrivatekey);
         if (f.exists()) {
-            logger.info( "Key exists");
+            logger.info("Key exists");
             return true;
-            
         } else {
-                logger.info( "Key doesnot exists");
+            logger.info("Key doesnot exists");
             return false;
         }
-
     }
+
     @SuppressWarnings("nls")
     @Override
     public void retrieveData(Map<String, String> params, SvcLogicContext ctx) {
@@ -539,7 +470,6 @@ public class ChefAdapterImpl implements ChefAdapter {
     @SuppressWarnings("nls")
     @Override
     public void combineStrings(Map<String, String> params, SvcLogicContext ctx) {
-
         String string1 = params.get("String1");
         String string2 = params.get("String2");
         String dgContext = params.get("dgContext");
@@ -552,14 +482,15 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     /**
      * Send GET request to chef server
-     * @throws SvcLogicException 
+     * 
+     * @throws SvcLogicException
      */
-     @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
 
     @Override
     public void chefGet(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         logger.info("chef get method");
-        chefInfo(params,ctx);
+        chefInfo(params, ctx);
         String chefAction = params.get("chefAction");
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
@@ -582,13 +513,14 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     /**
      * Send PUT request to chef server
-     * @throws SvcLogicException 
+     * 
+     * @throws SvcLogicException
      */
-     @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
 
     @Override
     public void chefPut(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        chefInfo(params,ctx);
+        chefInfo(params, ctx);
         String chefAction = params.get("chefAction");
         String chefNodeStr = params.get("chefRequestBody");
         RequestContext rc = new RequestContext(ctx);
@@ -606,19 +538,19 @@ public class ChefAdapterImpl implements ChefAdapter {
             code = 500;
             message = "Cannot find the private key in the APPC file system, please load the private key to "
                     + clientPrivatekey;
-
         }
         logger.info(code + "   " + message);
         chefServerResult(rc, Integer.toString(code), message);
     }
 
     /**
-     *  send Post request to chef server
-     * @throws SvcLogicException 
+     * send Post request to chef server
+     * 
+     * @throws SvcLogicException
      */
     @Override
     public void chefPost(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        chefInfo(params,ctx);
+        chefInfo(params, ctx);
         logger.info("chef Post method");
         logger.info(username + " " + clientPrivatekey + " " + chefserver + " " + organizations);
         String chefNodeStr = params.get("chefRequestBody");
@@ -648,17 +580,18 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     /**
      * send delete request to chef server
-     * @throws SvcLogicException 
+     * 
+     * @throws SvcLogicException
      */
     @Override
     public void chefDelete(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         logger.info("chef delete method");
-        chefInfo(params,ctx);
+        chefInfo(params, ctx);
         String chefAction = params.get("chefAction");
         RequestContext rc = new RequestContext(ctx);
         rc.isAlive();
         int code;
-        String message =null;
+        String message = null;
         if (privateKeyCheck()) {
             ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
             ApiMethod am = cac.delete(chefAction);
@@ -667,9 +600,8 @@ public class ChefAdapterImpl implements ChefAdapter {
             message = am.getResponseBodyAsString();
         } else {
             code = 500;
-         message = "Cannot find the private key in the APPC file system, please load the private key to "
+            message = "Cannot find the private key in the APPC file system, please load the private key to "
                     + clientPrivatekey;
-
         }
         logger.info(code + "   " + message);
         chefServerResult(rc, Integer.toString(code), message);
@@ -702,105 +634,96 @@ public class ChefAdapterImpl implements ChefAdapter {
     @SuppressWarnings("nls")
     @Override
     public void checkPushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-         int code;
+        int code;
         try {
-        chefInfo(params,ctx);
-        String jobID = params.get("jobid");
-      String retry=  params.get("retryTimes");
-      String intrva=   params.get("retryInterval");
-      if (StringUtils.isNotBlank(retry) && StringUtils.isNotBlank(intrva))
-        {
-        
-        int retryTimes = Integer.parseInt(params.get("retryTimes"));
-        int retryInterval = Integer.parseInt(params.get("retryInterval"));
-        
-        String chefAction = "/pushy/jobs/" + jobID;
-
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        String message = "";
-        String status = "";
-        for (int i = 0; i < retryTimes; i++) {
-            try {
-                Thread.sleep(retryInterval); // 1000 milliseconds is one second.
-            } catch (InterruptedException ex) {
-                Thread.currentThread().interrupt();
-            }
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-            ApiMethod am = cac.get(chefAction);
-            am.execute();
-             code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
-            JSONObject obj = new JSONObject(message);
-            status = obj.getString("status");
-            if (!status.equals("running")) {
-                logger.info(i + " time " + code + "   " + status);
-                break;
-            }
-
-        }
-   if (status.equals("complete")) {
-            svcLogic.setAttribute("chefServerResult.code", "200");
-            svcLogic.setAttribute("chefServerResult.message", message);
-        } else {
-            if (status.equals("running"))  {
-                svcLogic.setAttribute("chefServerResult.code", "202");
-                svcLogic.setAttribute("chefServerResult.message", "chef client runtime out");
-            } else {
-                svcLogic.setAttribute("chefServerResult.code", "500");
-                svcLogic.setAttribute("chefServerResult.message", message);
+            chefInfo(params, ctx);
+            String jobID = params.get("jobid");
+            String retry = params.get("retryTimes");
+            String intrva = params.get("retryInterval");
+            if (StringUtils.isNotBlank(retry) && StringUtils.isNotBlank(intrva)) {
+
+                int retryTimes = Integer.parseInt(params.get("retryTimes"));
+                int retryInterval = Integer.parseInt(params.get("retryInterval"));
+
+                String chefAction = "/pushy/jobs/" + jobID;
+
+                RequestContext rc = new RequestContext(ctx);
+                rc.isAlive();
+                SvcLogicContext svcLogic = rc.getSvcLogicContext();
+                String message = StringUtils.EMPTY;
+                String status = StringUtils.EMPTY;
+                for (int i = 0; i < retryTimes; i++) {
+                    try {
+                        Thread.sleep(retryInterval); // 1000 milliseconds is one second.
+                    } catch (InterruptedException ex) {
+                        Thread.currentThread().interrupt();
+                    }
+                    ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+                    ApiMethod am = cac.get(chefAction);
+                    am.execute();
+                    code = am.getReturnCode();
+                    message = am.getResponseBodyAsString();
+                    JSONObject obj = new JSONObject(message);
+                    status = obj.getString("status");
+                    if (!status.equals("running")) {
+                        logger.info(i + " time " + code + "   " + status);
+                        break;
+                    }
+                }
+                if (status.equals("complete")) {
+                    svcLogic.setAttribute("chefServerResult.code", "200");
+                    svcLogic.setAttribute("chefServerResult.message", message);
+                } else {
+                    if (status.equals("running")) {
+                        svcLogic.setAttribute("chefServerResult.code", "202");
+                        svcLogic.setAttribute("chefServerResult.message", "chef client runtime out");
+                    } else {
+                        svcLogic.setAttribute("chefServerResult.code", "500");
+                        svcLogic.setAttribute("chefServerResult.message", message);
+                    }
+                }
             }
-        }
-        }
-        
-        else
-        {    
+            else {
                 throw new SvcLogicException("Missing Mandatory param(s) retryTimes , retryInterval ");
-            
-        }
-        }
-        catch(Exception e)
-        {
+            }
+        } catch (Exception e) {
             code = 401;
-            doFailure(ctx,code,e.getMessage());
+            doFailure(ctx, code, e.getMessage());
         }
-   
     }
+
     @SuppressWarnings("nls")
     @Override
     public void pushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         int code;
-        try{
-        chefInfo(params,ctx);
-        String pushRequest = params.get("pushRequest");
-        String chefAction = "/pushy/jobs";
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-        ApiMethod am = cac.post(chefAction).body(pushRequest);
-
-        am.execute();
-         code = am.getReturnCode();
-        String message = am.getResponseBodyAsString();
-        if (code == 201) {
-            int startIndex = message.indexOf("jobs") + 6;
-            int endIndex = message.length() - 2;
-            String jobID = message.substring(startIndex, endIndex);
-            svcLogic.setAttribute("jobID", jobID);
-            logger.info(jobID);
-        }
-        chefServerResult(rc, Integer.toString(code), message);
-        }
-        catch(Exception e)
-        {
+        try {
+            chefInfo(params, ctx);
+            String pushRequest = params.get("pushRequest");
+            String chefAction = "/pushy/jobs";
+            RequestContext rc = new RequestContext(ctx);
+            rc.isAlive();
+            SvcLogicContext svcLogic = rc.getSvcLogicContext();
+            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+            ApiMethod am = cac.post(chefAction).body(pushRequest);
+
+            am.execute();
+            code = am.getReturnCode();
+            String message = am.getResponseBodyAsString();
+            if (code == 201) {
+                int startIndex = message.indexOf("jobs") + 6;
+                int endIndex = message.length() - 2;
+                String jobID = message.substring(startIndex, endIndex);
+                svcLogic.setAttribute("jobID", jobID);
+                logger.info(jobID);
+            }
+            chefServerResult(rc, Integer.toString(code), message);
+        } catch (Exception e) {
             code = 401;
-            doFailure(ctx,code,e.getMessage());
+            doFailure(ctx, code, e.getMessage());
         }
     }
-     
-     @SuppressWarnings("static-method")
+
+    @SuppressWarnings("static-method")
     private void doFailure(RequestContext rc, int code, String message) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         String msg = (message == null) ? Integer.toString(code) : message;
@@ -812,7 +735,7 @@ public class ChefAdapterImpl implements ChefAdapter {
         try {
             status = Integer.toString(code);
         } catch (Exception e) {
-           
+
             status = "500";
         }
         svcLogic.setAttribute("chefAgent.code", status);
@@ -821,57 +744,53 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     /**
      * @param rc
-     *            The request context that manages the state and recovery of the
-     *            request for the life of its processing.
+     *        The request context that manages the state and recovery of the
+     *        request for the life of its processing.
      */
-     @SuppressWarnings("static-method")
+    @SuppressWarnings("static-method")
     private void doSuccess(RequestContext rc) {
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setAttribute("chefAgent.code", "200");
     }
+
     @SuppressWarnings("static-method")
     private void chefServerResult(RequestContext rc, String code, String message) {
-        String msg = (message == null) ? " " : message;
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(OUTCOME_SUCCESS);
         svcLogic.setAttribute("chefServerResult.code", code);
         svcLogic.setAttribute("chefServerResult.message", message);
-        logger.info("chefServerResult.code"+svcLogic.getAttribute("chefServerResult.code"));
-            logger.info("chefServerResult.message"+svcLogic.getAttribute("chefServerResult.message"));
+        logger.info("chefServerResult.code" + svcLogic.getAttribute("chefServerResult.code"));
+        logger.info("chefServerResult.message" + svcLogic.getAttribute("chefServerResult.message"));
     }
+
     @SuppressWarnings("static-method")
     private void chefClientResult(RequestContext rc, String code, String message) {
-        String msg = (message == null) ? " " : message;
         SvcLogicContext svcLogic = rc.getSvcLogicContext();
         svcLogic.setStatus(OUTCOME_SUCCESS);
         svcLogic.setAttribute("chefClientResult.code", code);
         svcLogic.setAttribute("chefClientResult.message", message);
-        logger.info("chefClientResult.code"+svcLogic.getAttribute("chefClientResult.code"));
-            logger.info("chefClientResult.message"+svcLogic.getAttribute("chefClientResult.message"));
+        logger.info("chefClientResult.code" + svcLogic.getAttribute("chefClientResult.code"));
+        logger.info("chefClientResult.message" + svcLogic.getAttribute("chefClientResult.message"));
     }
 
     /**
      * initialize the provider adapter by building the context cache
      */
     private void initialize() {
-        
+
         logger.info("Initialize Chef Adapter");
     }
 
-   
-     @SuppressWarnings("static-method")
-    private void doFailure(SvcLogicContext svcLogic,  int code, String message)  throws SvcLogicException {
-
-         if (message.contains("\n")) {
-             message = message.substring(message.indexOf("\n"));
-         }
-    svcLogic.setStatus(OUTCOME_FAILURE);
-    svcLogic.setAttribute("chefServerResult.code",Integer.toString(code));
-    svcLogic.setAttribute("chefServerResult.message",message);
-    
-    throw new SvcLogicException("Chef Adapater Error = " + message );
-    }                                                                                                       
+    @SuppressWarnings("static-method")
+    private void doFailure(SvcLogicContext svcLogic, int code, String message) throws SvcLogicException {
 
-    
+        if (message.contains("\n")) {
+            message = message.substring(message.indexOf("\n"));
+        }
+        svcLogic.setStatus(OUTCOME_FAILURE);
+        svcLogic.setAttribute("chefServerResult.code", Integer.toString(code));
+        svcLogic.setAttribute("chefServerResult.message", message);
 
+        throw new SvcLogicException("Chef Adapater Error = " + message);
+    }
 }