From 72a9ab9e886cdeabc4b43418a7054a5796a0ff55 Mon Sep 17 00:00:00 2001 From: sliard Date: Mon, 12 Apr 2021 15:58:22 +0200 Subject: [DMAAP-CLIENT] First sonar issues review part2 update Copyright informations fix checkstyle warning and fix code review comments remove Prop Issue-ID: DMAAP-1585 Change-Id: I445ca5d0888a555acbac70af7ed571be26d74f79 Signed-off-by: sliard --- .../org/onap/dmaap/mr/tools/ApiKeyCommand.java | 191 +++++++++------------ 1 file changed, 85 insertions(+), 106 deletions(-) (limited to 'src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java') diff --git a/src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java b/src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java index a2396d8..6a2bf37 100644 --- a/src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java +++ b/src/main/java/org/onap/dmaap/mr/tools/ApiKeyCommand.java @@ -4,11 +4,13 @@ * ================================================================================ * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright © 2021 Orange. + * ================================================================================ * 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. @@ -17,125 +19,102 @@ * ============LICENSE_END========================================================= * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * + * *******************************************************************************/ -package org.onap.dmaap.mr.tools; -import java.io.IOException; -import java.io.PrintStream; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +package org.onap.dmaap.mr.tools; import com.att.nsa.apiClient.credentials.ApiCredential; import com.att.nsa.apiClient.http.HttpException; import com.att.nsa.apiClient.http.HttpObjectNotFoundException; import com.att.nsa.cmdtool.Command; import com.att.nsa.cmdtool.CommandNotReadyException; +import java.io.IOException; +import java.io.PrintStream; +import org.onap.dmaap.mr.client.MRClient.MRApiException; import org.onap.dmaap.mr.client.MRClientFactory; import org.onap.dmaap.mr.client.MRIdentityManager; -import org.onap.dmaap.mr.client.MRClient.MRApiException; import org.onap.dmaap.mr.client.MRIdentityManager.ApiKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ApiKeyCommand implements Command { + final Logger logger = LoggerFactory.getLogger(ApiKeyCommand.class); -public class ApiKeyCommand implements Command -{ - final Logger log = LoggerFactory.getLogger(ApiKeyCommand.class); - @Override - public String[] getMatches () - { - return new String[]{ - "key (create|update) (\\S*) (\\S*)", - "key (list) (\\S*)", - "key (revoke)", - }; - } + @Override + public String[] getMatches() { + return new String[] { + "key (create|update) (\\S*) (\\S*)", + "key (list) (\\S*)", + "key (revoke)", + }; + } - @Override - public void checkReady ( MRCommandContext context ) throws CommandNotReadyException - { - if ( !context.checkClusterReady () ) - { - throw new CommandNotReadyException ( "Use 'cluster' to specify a cluster to use." ); - } - } + @Override + public void checkReady(MRCommandContext context) throws CommandNotReadyException { + if (!context.checkClusterReady()) { + throw new CommandNotReadyException("Use 'cluster' to specify a cluster to use."); + } + } - @Override - public void execute ( String[] parts, MRCommandContext context, PrintStream out ) throws CommandNotReadyException - { - final MRIdentityManager tm = MRClientFactory.createIdentityManager ( context.getCluster(), context.getApiKey(), context.getApiPwd() ); - context.applyTracer ( tm ); + @Override + public void execute(String[] parts, MRCommandContext context, PrintStream out) throws CommandNotReadyException { + final MRIdentityManager tm = MRClientFactory.createIdentityManager(context.getCluster(), context.getApiKey(), context.getApiPwd()); + context.applyTracer(tm); - try - { - if ( parts[0].equals ( "list" ) ) - { - final ApiKey key = tm.getApiKey ( parts[1] ); - if ( key != null ) - { - out.println ( "email: " + key.getEmail () ); - out.println ( "description: " + key.getDescription () ); - } - else - { - out.println ( "No key returned" ); - } - } - else if ( parts[0].equals ( "create" ) ) - { - final ApiCredential ac = tm.createApiKey ( parts[1], parts[2] ); - if ( ac != null ) - { - out.println ( " key: " + ac.getApiKey () ); - out.println ( "secret: " + ac.getApiSecret () ); - } - else - { - out.println ( "No credential returned?" ); - } - } - else if ( parts[0].equals ( "update" ) ) - { - tm.updateCurrentApiKey ( parts[1], parts[2] ); - out.println ( "Updated" ); - } - else if ( parts[0].equals ( "revoke" ) ) - { - tm.deleteCurrentApiKey (); - out.println ( "Updated" ); - } - } - catch ( HttpObjectNotFoundException e ) - { - out.println ( "Object not found: " + e.getMessage () ); - log.error("HttpObjectNotFoundException: ", e); - } - catch ( HttpException e ) - { - out.println ( "HTTP exception: " + e.getMessage () ); - log.error("HttpException: ", e); - } - catch ( MRApiException e ) - { - out.println ( "API exception: " + e.getMessage () ); - log.error("MRApiException: ", e); - } - catch ( IOException e ) - { - out.println ( "IO exception: " + e.getMessage () ); - log.error("IOException: ", e); - } - finally - { - tm.close (); - } - } + try { + switch (parts[0]) { + case "list": + final ApiKey key = tm.getApiKey(parts[1]); + if (key != null) { + out.println("email: " + key.getEmail()); + out.println("description: " + key.getDescription()); + } else { + out.println("No key returned"); + } + break; + case "create": + final ApiCredential ac = tm.createApiKey(parts[1], parts[2]); + if (ac != null) { + out.println(" key: " + ac.getApiKey()); + out.println("secret: " + ac.getApiSecret()); + } else { + out.println("No credential returned?"); + } + break; + case "update": + tm.updateCurrentApiKey(parts[1], parts[2]); + out.println("Updated"); + break; + case "revoke": + tm.deleteCurrentApiKey(); + out.println("Updated"); + break; + default: + throw new CommandNotReadyException("The command " + parts[0] + " is not available"); + } + } catch (HttpObjectNotFoundException e) { + out.println("Object not found: " + e.getMessage()); + logger.error("HttpObjectNotFoundException: ", e); + } catch (HttpException e) { + out.println("HTTP exception: " + e.getMessage()); + logger.error("HttpException: ", e); + } catch (MRApiException e) { + out.println("API exception: " + e.getMessage()); + logger.error("MRApiException: ", e); + } catch (IOException e) { + out.println("IO exception: " + e.getMessage()); + logger.error("IOException: ", e); + } finally { + tm.close(); + } + } - @Override - public void displayHelp ( PrintStream out ) - { - out.println ( "key create " ); - out.println ( "key update " ); - out.println ( "key list " ); - out.println ( "key revoke" ); - } + @Override + public void displayHelp(PrintStream out) { + out.println("key create "); + out.println("key update "); + out.println("key list "); + out.println("key revoke"); + } } -- cgit 1.2.3-korg