From 337f36602a553ecb937c041a27b1c7270571c647 Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 6 Sep 2019 18:11:51 +0200 Subject: [PATCH] Fix sonar issues FIx some issues reported incorrectly by sonar for the new javascript code Issue-ID: CLAMP-425 Change-Id: I485b727c3a6007c0f0f9301fcda526b028d6251f Signed-off-by: sebdet --- pom.xml | 4 ++-- ui-react/src/api/LoopActionService.js | 4 ++-- ui-react/src/api/LoopService.js | 20 ++++++++++---------- ui-react/src/api/UserService.js | 6 +++--- .../ConfigurationPolicy/ConfigurationPolicyModal.js | 2 +- ui-react/src/components/dialogs/LoopProperties.js | 5 ++--- .../OperationalPolicy/OperationalPolicyModal.js | 2 +- ui-react/src/components/loop_viewer/logs/LoopLogs.js | 4 ++-- .../src/components/loop_viewer/status/LoopStatus.js | 4 ++-- ui-react/src/components/loop_viewer/svg/LoopSvg.js | 4 ++-- version.properties | 2 +- 11 files changed, 28 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index efb95cad..698717b7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.onap.clamp clds - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT clamp @@ -93,7 +93,7 @@ - src/main,${project.build.directory}/${ui.react.src} + src/main,${project.build.directory}/${ui.react.src}/src ${project.build.directory}/${ui.react.src}/coverage/lcov.info src/main/resources/** diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js index 6e45ce4b..7e20e2f6 100644 --- a/ui-react/src/api/LoopActionService.js +++ b/ui-react/src/api/LoopActionService.js @@ -28,7 +28,7 @@ export default class LoopActionService{ const svcAction = uiAction.toLowerCase(); return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, { method: 'PUT', - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { if (response.ok) { @@ -53,7 +53,7 @@ export default class LoopActionService{ return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, { method: 'GET', - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { if (response.ok) { diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js index eece20c9..e2e23482 100644 --- a/ui-react/src/api/LoopService.js +++ b/ui-react/src/api/LoopService.js @@ -22,7 +22,7 @@ export default class LoopService { static getLoopNames() { - return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin', }) + return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' }) .then(function (response) { console.debug("GetLoopNames response received: ", response.status); if (response.ok) { @@ -42,9 +42,9 @@ export default class LoopService { return fetch('/restservices/clds/v2/loop/' + loopName, { method: 'GET', headers: { - "Content-Type": "application/json", + "Content-Type": "application/json" }, - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { console.debug("GetLoop response received: ", response.status); @@ -64,7 +64,7 @@ export default class LoopService { static getSvg(loopName) { return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, { method: 'GET', - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { console.debug("svgRepresentation response received: ", response.status); @@ -86,9 +86,9 @@ export default class LoopService { method: 'POST', credentials: 'same-origin', headers: { - "Content-Type": "application/json", + "Content-Type": "application/json" }, - body: JSON.stringify(jsonData), + body: JSON.stringify(jsonData) }) .then(function (response) { console.debug("updateMicroservicePolicy response received: ", response.status); @@ -110,9 +110,9 @@ export default class LoopService { method: 'POST', credentials: 'same-origin', headers: { - "Content-Type": "application/json", + "Content-Type": "application/json" }, - body: JSON.stringify(jsonData), + body: JSON.stringify(jsonData) }) .then(function (response) { console.debug("updateOperationalPolicies response received: ", response.status); @@ -134,9 +134,9 @@ export default class LoopService { method: 'POST', credentials: 'same-origin', headers: { - "Content-Type": "application/json", + "Content-Type": "application/json" }, - body: JSON.stringify(jsonData), + body: JSON.stringify(jsonData) }) .then(function (response) { console.debug("updateGlobalProperties response received: ", response.status); diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js index 37ec73d1..8da6e3a7 100644 --- a/ui-react/src/api/UserService.js +++ b/ui-react/src/api/UserService.js @@ -26,7 +26,7 @@ export default class UserService { static login() { return fetch('/restservices/clds/v1/user/getUser', { method: 'GET', - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { console.debug("getUser response received, status code:", response.status); @@ -51,7 +51,7 @@ export default class UserService { static logout() { return fetch('/restservices/clds/v1/user/logout', { method: 'POST', - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { console.debug("logout response received, status code:", response.status); @@ -76,7 +76,7 @@ export default class UserService { static getUserInfo() { return fetch('/restservices/clds/v1/clds/cldsInfo', { method: 'GET', - credentials: 'same-origin', + credentials: 'same-origin' }) .then(function (response) { console.debug("getUserInfo response received, status code:", response.status); diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js index 9863ef72..b0f601ec 100644 --- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js +++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js @@ -38,7 +38,7 @@ export default class ConfigurationPolicyModal extends React.Component { show: true, loopCache: this.props.loopCache, jsonEditor: null, - componentName: this.props.match.params.componentName, + componentName: this.props.match.params.componentName }; constructor(props, context) { diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js index fa82a7e4..990fe775 100644 --- a/ui-react/src/components/dialogs/LoopProperties.js +++ b/ui-react/src/components/dialogs/LoopProperties.js @@ -35,7 +35,7 @@ export default class LoopProperties extends React.Component { state = { show: true, loopCache: this.props.loopCache, - temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())), + temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())) }; constructor(props, context) { @@ -53,8 +53,7 @@ export default class LoopProperties extends React.Component { componentWillReceiveProps(newProps) { this.setState({ loopCache: newProps.loopCache, - temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties())), - + temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties())) }); } diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js index 7f349a10..1ebe5f0e 100644 --- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js +++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js @@ -37,7 +37,7 @@ export default class OperationalPolicyModal extends React.Component { state = { show: true, loopCache: this.props.loopCache, - jsonEditor: null, + jsonEditor: null }; constructor(props, context) { diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js index b6a777a4..6abdc4b4 100644 --- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js +++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js @@ -47,7 +47,7 @@ const TableRow = ({ logRow }) => ( export default class LoopLogs extends React.Component { state = { - loopCache: new LoopCache({}), + loopCache: new LoopCache({}) } constructor(props) { super(props); @@ -61,7 +61,7 @@ export default class LoopLogs extends React.Component { componentWillReceiveProps(newProps) { this.setState({ - loopCache: newProps.loopCache, + loopCache: newProps.loopCache }); } diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.js b/ui-react/src/components/loop_viewer/status/LoopStatus.js index 141a41f5..d960c31e 100644 --- a/ui-react/src/components/loop_viewer/status/LoopStatus.js +++ b/ui-react/src/components/loop_viewer/status/LoopStatus.js @@ -46,7 +46,7 @@ const TableRow = ({ statusRow }) => ( export default class LoopStatus extends React.Component { state = { - loopCache: new LoopCache({}), + loopCache: new LoopCache({}) } constructor(props) { @@ -74,7 +74,7 @@ export default class LoopStatus extends React.Component { componentWillReceiveProps(newProps) { this.setState({ - loopCache: newProps.loopCache, + loopCache: newProps.loopCache }); } diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js index 1b1e2428..48f0335f 100644 --- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js +++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js @@ -45,7 +45,7 @@ class LoopViewSvg extends React.Component { state = { svgContent: LoopViewSvg.emptySvg, loopCache: new LoopCache({}), - componentModalMapping: new Map([]), + componentModalMapping: new Map([]) } constructor(props) { @@ -65,7 +65,7 @@ class LoopViewSvg extends React.Component { if (this.state.loopCache !== newProps.loopCache) { this.setState({ loopCache: newProps.loopCache, - componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache), + componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache) }); this.getSvg(newProps.loopCache.getLoopName()); } diff --git a/version.properties b/version.properties index 0a0ad216..75f8a3b3 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=4 minor=1 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} -- 2.16.6