diff options
Diffstat (limited to 'appc-adapters')
2 files changed, 7 insertions, 6 deletions
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/ConnectionBuilder.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/ConnectionBuilder.java index 29afc633d..0bcc1a32c 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/ConnectionBuilder.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/ConnectionBuilder.java @@ -110,7 +110,7 @@ public class ConnectionBuilder implements Closeable { **/ public ConnectionBuilder(String trustStoreFile, char[] trustStorePasswd, int timeout, String serverIP) throws KeyStoreException, IOException, KeyManagementException, NoSuchAlgorithmException, - CertificateException ,APPCException{ + CertificateException { /* Load the specified trustStore */ KeyStore keystore = KeyStore.getInstance("JKS"); @@ -138,7 +138,7 @@ public class ConnectionBuilder implements Closeable { */ public ConnectionBuilder(int mode, int timeout) - throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException,APPCException{ + throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException { RequestConfig config = RequestConfig.custom().setSocketTimeout(timeout).build(); if (mode == 1) { SSLContext sslcontext = SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build(); diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/impl/ChefApiHeaderFactory.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/impl/ChefApiHeaderFactory.java index e40eee2a6..a2df23506 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/impl/ChefApiHeaderFactory.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/impl/ChefApiHeaderFactory.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2018 Nokia. All rights reserved. * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Modification Copyright (C) 2019 IBM * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,11 +55,11 @@ public class ChefApiHeaderFactory { sb.append("X-Ops-Timestamp:").append(timeStamp).append("\n"); sb.append("X-Ops-UserId:").append(userId); - String auth_String = Utils.signWithRSA(sb.toString(), pemPath); - String[] auth_headers = Utils.splitAs60(auth_String); + String authString = Utils.signWithRSA(sb.toString(), pemPath); + String[] authHeaders = Utils.splitAs60(authString); - for (int i = 0; i < auth_headers.length; i++) { - builder.put("X-Ops-Authorization-" + (i + 1), auth_headers[i]); + for (int i = 0; i < authHeaders.length; i++) { + builder.put("X-Ops-Authorization-" + (i + 1), authHeaders[i]); } return builder.build(); |