aboutsummaryrefslogtreecommitdiffstats
path: root/client/client-monitoring/src
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-11-27 13:32:45 +0000
committerliamfallon <liam.fallon@est.tech>2019-11-28 11:06:05 +0000
commit9253f81d14a5217479ca8e59efb198eaa32ec9f0 (patch)
tree4b4c5d42738928e9ade09e57d1b4cc01cdc7ae75 /client/client-monitoring/src
parent8a3a78067eb678f3e51e2199a57b713e3ffcfb29 (diff)
Replace getCaononicalName() with getName() in code base
Issue-ID: POLICY-1861 Change-Id: Iccbdcbc5b5978305c56ab74c01a52a562697bee1 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'client/client-monitoring/src')
-rw-r--r--client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java
index 468fd5aa7..abc30ce8f 100644
--- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java
+++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +40,10 @@ public class ApexMonitoringRestMain {
// Services state
public enum ServicesState {
- STOPPED, READY, INITIALIZING, RUNNING
+ STOPPED,
+ READY,
+ INITIALIZING,
+ RUNNING
}
private ServicesState state = ServicesState.STOPPED;
@@ -72,12 +76,12 @@ public class ApexMonitoringRestMain {
} catch (final ApexMonitoringRestParameterException e) {
throw new ApexMonitoringRestParameterException(
REST_ENDPOINT_PREFIX + this.toString() + ") parameter error, " + e.getMessage() + '\n'
- + parser.getHelp(ApexMonitoringRestMain.class.getCanonicalName()), e);
+ + parser.getHelp(ApexMonitoringRestMain.class.getName()),
+ e);
}
if (parameters.isHelpSet()) {
- throw new ApexMonitoringRestParameterException(
- parser.getHelp(ApexMonitoringRestMain.class.getCanonicalName()));
+ throw new ApexMonitoringRestParameterException(parser.getHelp(ApexMonitoringRestMain.class.getName()));
}
// Validate the parameters
@@ -85,7 +89,7 @@ public class ApexMonitoringRestMain {
if (validationMessage.length() > 0) {
throw new ApexMonitoringRestParameterException(
REST_ENDPOINT_PREFIX + this.toString() + ") parameters invalid, " + validationMessage + '\n'
- + parser.getHelp(ApexMonitoringRestMain.class.getCanonicalName()));
+ + parser.getHelp(ApexMonitoringRestMain.class.getName()));
}
state = ServicesState.READY;
@@ -131,7 +135,8 @@ public class ApexMonitoringRestMain {
String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage();
outStream.println(message);
LOGGER.warn(message, e);
- } finally {
+ }
+ finally {
if (apexMonitoringRest != null) {
apexMonitoringRest.shutdown();
apexMonitoringRest = null;