From 6c3192ce8ef5283b97da0853e39a0d571f6bdd7b Mon Sep 17 00:00:00 2001 From: waynedunican Date: Thu, 13 Aug 2020 12:23:39 +0100 Subject: SONAR fixes - log formatting Fixed the sonar issues relating to Printf format being used for logging instead of String concatenation Issue-ID: POLICY-2773 Change-Id: I38db8d1df077fd7102f6c4f9b33685f2914bd624 Signed-off-by: waynedunican --- .../apex/plugins/event/carrier/jms/ApexJmsConsumer.java | 4 ++-- .../event/carrier/restserver/ApexRestServerProducer.java | 5 +++-- .../filecarrierplugin/consumer/ApexFileEventConsumer.java | 13 +++++++------ .../onap/policy/apex/services/onappf/ApexStarterMain.java | 4 +++- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java index d7460ec84..9fbc36116 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java @@ -139,8 +139,8 @@ public class ApexJmsConsumer extends ApexPluginsEventConsumer implements Message } // Everything is now set up if (LOGGER.isDebugEnabled()) { - LOGGER.debug("event receiver " + this.getClass().getName() + ":" + this.name + " subscribed to JMS topic: " - + jmsConsumerProperties.getConsumerTopic()); + LOGGER.debug("event receiver {}:{} subscribed to JMS topic: {}", this.getClass().getName(), + this.name, jmsConsumerProperties.getConsumerTopic()); } } diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java index 32a6890a3..62e6c459b 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java @@ -1,6 +1,7 @@ /*- * ============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. @@ -136,8 +137,8 @@ public class ApexRestServerProducer implements ApexEventProducer { } if (LOGGER.isDebugEnabled()) { - LOGGER.debug(name + ": event " + executionId + ':' + eventName + " is a reply to a REST server call from " - + name); + LOGGER.debug("{}: event {}:{} is a reply to a REST server call from {}", + name, executionId, eventName, name); } // Add the event to the received event cache diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java index 04de6b1bc..076c50b40 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java @@ -1,6 +1,7 @@ /*- * ============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. @@ -199,14 +200,14 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable { } } while (!textBlock.isEndOfText()); } catch (final Exception e) { - LOGGER.warn("\"" + consumerName + "\" failed to read event from file: \"" - + fileCarrierTechnologyParameters.getFileName() + "\"", e); + LOGGER.warn("\"{}\" failed to read event from file: \"{}\"", consumerName, + fileCarrierTechnologyParameters.getFileName(), e); } finally { try { eventInputStream.close(); } catch (final IOException e) { - LOGGER.warn(APEX_FILE_CONSUMER_PREAMBLE + consumerName + "\" failed to close file: \"" - + fileCarrierTechnologyParameters.getFileName() + "\"", e); + LOGGER.warn("{}{}\" failed to close file: \"{}\"", APEX_FILE_CONSUMER_PREAMBLE, consumerName, + fileCarrierTechnologyParameters.getFileName(), e); } } @@ -220,8 +221,8 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable { try { eventInputStream.close(); } catch (final IOException e) { - LOGGER.warn(APEX_FILE_CONSUMER_PREAMBLE + consumerName + "\" failed to close file for reading: \"" - + fileCarrierTechnologyParameters.getFileName() + "\"", e); + LOGGER.warn("{}{}\" failed to close file for reading: \"{}\"", + APEX_FILE_CONSUMER_PREAMBLE, consumerName, fileCarrierTechnologyParameters.getFileName(), e); } if (consumerThread.isAlive() && !consumerThread.isInterrupted()) { diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java index 4a5fb360e..609be10c2 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2019-2020 Nordix Foundation. * Modifications Copyright (C) 2019 AT&T Intellectual Property. 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. @@ -50,7 +51,8 @@ public class ApexStarterMain { * @param args the command line arguments */ public ApexStarterMain(final String[] args) { - LOGGER.info("In ApexStarter with parameters " + Arrays.toString(args)); + final String params = Arrays.toString(args); + LOGGER.info("In ApexStarter with parameters {}", params); // Check the arguments final ApexStarterCommandLineArguments arguments = new ApexStarterCommandLineArguments(); -- cgit 1.2.3-korg