From b39a52fd7c477d85fda04697f68a1bbfa64f6858 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 9 May 2019 15:38:25 +0530
Subject: [PATCH 01/13] Create new action for lifecycle modal

---
 .../src/components/apps/release/LifeCycle.js  | 29 ++++++--
 .../components/apps/release/LifeCycleGraph.js | 14 +++-
 .../components/apps/release/LifecycleModal.js | 74 +++++++++++++++++++
 .../react-app/src/js/actions/index.js         | 11 +++
 .../react-app/src/js/constants/ActionTypes.js |  4 +-
 .../react-app/src/js/reducers/index.js        | 13 +++-
 .../pages/dashboard/apps/release/Release.js   |  7 +-
 7 files changed, 138 insertions(+), 14 deletions(-)
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
index 1d76067d7f1..4896801b578 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
@@ -1,10 +1,13 @@
 import React from "react";
 import LifeCycleGraph from "./LifeCycleGraph";
 import {connect} from "react-redux";
-import {getLifecycle, openReleasesModal} from "../../../js/actions";
+import {getLifecycle, openLifecycleModal} from "../../../js/actions";
+import {Button} from "antd";
+import LifecycleModal from "./LifecycleModal";
 
 const mapDispatchToProps = dispatch => ({
-    getLifecycle: () => dispatch(getLifecycle())
+    getLifecycle: () => dispatch(getLifecycle()),
+    openLifecycleModal: (nextState) => dispatch(openLifecycleModal(nextState))
 });
 
 const mapStateToProps = state => {
@@ -14,19 +17,35 @@ const mapStateToProps = state => {
 };
 
 class ConnectedLifeCycle extends React.Component {
+
+    constructor(props){
+        super(props);
+
+        this.openModal = this.openModal.bind(this);
+    }
+
     componentDidMount() {
         this.props.getLifecycle();
     }
 
+    openModal() {
+        console.log(this.props);
+        this.props.openLifecycleModal("IN_REVIEW");
+    }
+
     render() {
         console.log();
         const lifecycle = this.props.lifecycle;
-        if(lifecycle != null){
+        if (lifecycle != null) {
             return (
-                <LifeCycleGraph currentStatus={this.props.currentStatus} lifecycle={this.props.lifecycle}/>
+                <div>
+                    <LifecycleModal/>
+                    <Button onClick={this.openModal}>aaaa</Button>
+                    <LifeCycleGraph currentStatus={this.props.currentStatus} lifecycle={this.props.lifecycle}/>
+                </div>
             );
 
-        }else {
+        } else {
             return null;
         }
     }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
index f5051decd19..fc25a9b306b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
@@ -25,11 +25,10 @@ class LifeCycleGraph extends React.Component {
             let color = "rgb(83, 92, 104)";
             if (stateName === this.props.currentStatus) {
                 color = "rgb(192,255,0)";
-            }else if(nextStates.includes(stateName)){
+            } else if (nextStates.includes(stateName)) {
                 color = "rgb(0,192,255)";
             }
             const node = createNode(stateName, color);
-            // node.addPort()
             nodes.push(node);
             lifecycle[stateName].node = node;
         });
@@ -47,6 +46,11 @@ class LifeCycleGraph extends React.Component {
 
         nodes.forEach((node) => {
             model.addNode(node);
+            // node.addListener({
+            //     selectionChanged: (node, isSelected) => {
+            //         console.log(isSelected);
+            //     }
+            // });
         });
         links.forEach((link) => {
             model.addLink(link);
@@ -57,7 +61,7 @@ class LifeCycleGraph extends React.Component {
         engine.setDiagramModel(distributedModel);
 
         return (
-            <div style={{height: 900}}>
+            <div style={{height: 500}}>
                 <SRD.DiagramWidget diagramEngine={engine} maxNumberPointsPerLink={10} smartRouting={true}/>
             </div>
         );
@@ -87,4 +91,8 @@ function connectNodes(nodeFrom, nodeTo) {
     return nodeFrom.getPort(outPortName).link(nodeTo.getPort(inPortName));
 }
 
+function f() {
+    console.log(1);
+}
+
 export default LifeCycleGraph;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
new file mode 100644
index 00000000000..2bef078f8f9
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
@@ -0,0 +1,74 @@
+import React from "react";
+import {Modal, Typography,List, Avatar} from 'antd';
+import {connect} from 'react-redux';
+
+// connecting state.releaseView with the component
+const mapStateToProps = state => {
+    console.log(state);
+    return {
+        nextState: state.lifecycleModal.nextState,
+        visible: state.lifecycleModal.visible
+    }
+};
+
+const Text = Typography;
+
+class ConnectedLifecycleModal extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            visible: false
+        };
+    }
+
+    componentWillReceiveProps(nextProps) {
+        if (nextProps !== this.props) {
+            console.log(nextProps);
+            this.setState({
+                visible: nextProps.visible
+            })
+        }
+    }
+
+    showModal = () => {
+        this.setState({
+            visible: true,
+        });
+    };
+
+    handleOk = (e) => {
+        this.setState({
+            visible: false,
+        });
+    };
+
+    handleCancel = (e) => {
+        this.setState({
+            visible: false,
+        });
+    };
+
+    render() {
+        if (this.props.nextState != null) {
+            const nextState = this.props.nextState;
+            return (
+                <div>
+                    <Modal
+                        title="Change State"
+                        visible={this.state.visible}
+                        onOk={this.handleOk}
+                        onCancel={this.handleCancel}
+                    >
+                        <p>Some contents...</p>
+                    </Modal>
+                </div>
+            );
+        } else {
+            return null;
+        }
+    }
+}
+
+const LifecycleModal = connect(mapStateToProps, null)(ConnectedLifecycleModal);
+
+export default LifecycleModal;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index f89df5fbf09..442fa33f73c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -55,6 +55,17 @@ export const openReleasesModal = (app) => dispatch => {
     });
 };
 
+
+export const openLifecycleModal = (nextState) => dispatch => {
+    console.log(nextState);
+    dispatch({
+        type: ActionTypes.OPEN_LIFECYCLE_MODAL,
+        payload: {
+            nextState: nextState
+        }
+    });
+};
+
 export const getLifecycle = ()=> dispatch =>{
     const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-publisher/v1.0/applications/lifecycle-config";
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
index dd66861ec7a..53bf7e8e57c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
@@ -6,8 +6,8 @@ const ActionTypes = keyMirror({
     OPEN_RELEASES_MODAL: null,
     CLOSE_RELEASES_MODAL: null,
     GET_RELEASE: null,
-    GET_LIFECYCLE: null
-
+    GET_LIFECYCLE: null,
+    OPEN_LIFECYCLE_MODAL: null
 });
 
 export default ActionTypes;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
index 0d720a35786..0a29b775005 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
@@ -7,7 +7,11 @@ const initialState = {
         app: null
     },
     release: null,
-    lifecycle: null
+    lifecycle: null,
+    lifecycleModal:{
+        visible: false,
+        nextState: null
+    }
 };
 
 function rootReducer(state = initialState, action) {
@@ -30,6 +34,13 @@ function rootReducer(state = initialState, action) {
         return Object.assign({}, state, {
             lifecycle: action.payload
         });
+    }else if (action.type === ActionTypes.OPEN_LIFECYCLE_MODAL) {
+        return Object.assign({}, state, {
+            lifecycleModal: {
+                visible: true,
+                nextState: action.payload.nextState
+            }
+        });
     }
     return state;
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js
index c01c0b9283f..ebf96e42f1c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js
@@ -69,14 +69,15 @@ class ConnectedRelease extends React.Component {
                                 <ReleaseView release={release}/>
                             </Card>
                         </Col>
-                        <Col span={8}>
+                    </Row>
+                    <Row style={{padding: 10}}>
+                        <Col>
                             <Card>
-                               <LifeCycle currentStatus={release.currentStatus.toUpperCase()}/>
+                                <LifeCycle currentStatus={release.currentStatus.toUpperCase()}/>
                             </Card>
                         </Col>
                     </Row>
                 </div>
-
             </div>
 
         );

From c2018da2e8e9c003657738d3534d005b7c4b38e0 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 9 May 2019 16:50:36 +0530
Subject: [PATCH 02/13] Fix issue: Publisher

not opening modal for second time
---
 .../src/components/apps/release/LifeCycle.js  |  7 +++----
 .../components/apps/release/LifecycleModal.js | 19 ++++++++++++++-----
 .../react-app/src/js/actions/index.js         |  7 ++++++-
 .../react-app/src/js/constants/ActionTypes.js |  3 ++-
 .../react-app/src/js/reducers/index.js        |  7 +++++++
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
index 4896801b578..0447bd02131 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
@@ -12,7 +12,8 @@ const mapDispatchToProps = dispatch => ({
 
 const mapStateToProps = state => {
     return {
-        lifecycle: state.lifecycle
+        lifecycle: state.lifecycle,
+        currentStatus : state.release.currentStatus.toUpperCase()
     };
 };
 
@@ -29,17 +30,15 @@ class ConnectedLifeCycle extends React.Component {
     }
 
     openModal() {
-        console.log(this.props);
         this.props.openLifecycleModal("IN_REVIEW");
     }
 
     render() {
-        console.log();
         const lifecycle = this.props.lifecycle;
         if (lifecycle != null) {
             return (
                 <div>
-                    <LifecycleModal/>
+                    <LifecycleModal currentStatus={this.props.currentStatus}/>
                     <Button onClick={this.openModal}>aaaa</Button>
                     <LifeCycleGraph currentStatus={this.props.currentStatus} lifecycle={this.props.lifecycle}/>
                 </div>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
index 2bef078f8f9..fa1e7194501 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
@@ -1,16 +1,23 @@
 import React from "react";
-import {Modal, Typography,List, Avatar} from 'antd';
+import {Modal, Typography,Icon,Input} from 'antd';
 import {connect} from 'react-redux';
+import {closeLifecycleModal} from "../../../js/actions";
+
+const { TextArea } = Input;
+const { Title } = Typography;
 
 // connecting state.releaseView with the component
 const mapStateToProps = state => {
-    console.log(state);
     return {
         nextState: state.lifecycleModal.nextState,
         visible: state.lifecycleModal.visible
     }
 };
 
+const mapDispatchToProps = dispatch => ({
+    closeLifecycleModal : () => dispatch(closeLifecycleModal())
+});
+
 const Text = Typography;
 
 class ConnectedLifecycleModal extends React.Component {
@@ -23,7 +30,6 @@ class ConnectedLifecycleModal extends React.Component {
 
     componentWillReceiveProps(nextProps) {
         if (nextProps !== this.props) {
-            console.log(nextProps);
             this.setState({
                 visible: nextProps.visible
             })
@@ -46,6 +52,7 @@ class ConnectedLifecycleModal extends React.Component {
         this.setState({
             visible: false,
         });
+        this.props.closeLifecycleModal();
     };
 
     render() {
@@ -59,7 +66,9 @@ class ConnectedLifecycleModal extends React.Component {
                         onOk={this.handleOk}
                         onCancel={this.handleCancel}
                     >
-                        <p>Some contents...</p>
+                        <Title level={4}>{this.props.currentStatus} <Icon type="arrow-right" /> {nextState}</Title>
+                        <p>Reason:</p>
+                        <TextArea placeholder="Please enter the reason..." autosize />
                     </Modal>
                 </div>
             );
@@ -69,6 +78,6 @@ class ConnectedLifecycleModal extends React.Component {
     }
 }
 
-const LifecycleModal = connect(mapStateToProps, null)(ConnectedLifecycleModal);
+const LifecycleModal = connect(mapStateToProps, mapDispatchToProps)(ConnectedLifecycleModal);
 
 export default LifecycleModal;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index 442fa33f73c..b64296dea97 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -57,7 +57,6 @@ export const openReleasesModal = (app) => dispatch => {
 
 
 export const openLifecycleModal = (nextState) => dispatch => {
-    console.log(nextState);
     dispatch({
         type: ActionTypes.OPEN_LIFECYCLE_MODAL,
         payload: {
@@ -66,6 +65,12 @@ export const openLifecycleModal = (nextState) => dispatch => {
     });
 };
 
+export const closeLifecycleModal = () => dispatch => {
+    dispatch({
+        type: ActionTypes.CLOSE_LIFECYCLE_MODAL
+    });
+};
+
 export const getLifecycle = ()=> dispatch =>{
     const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-publisher/v1.0/applications/lifecycle-config";
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
index 53bf7e8e57c..cf9dd0f39f1 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
@@ -7,7 +7,8 @@ const ActionTypes = keyMirror({
     CLOSE_RELEASES_MODAL: null,
     GET_RELEASE: null,
     GET_LIFECYCLE: null,
-    OPEN_LIFECYCLE_MODAL: null
+    OPEN_LIFECYCLE_MODAL: null,
+    CLOSE_LIFECYCLE_MODAL: null
 });
 
 export default ActionTypes;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
index 0a29b775005..6d770920f07 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
@@ -41,6 +41,13 @@ function rootReducer(state = initialState, action) {
                 nextState: action.payload.nextState
             }
         });
+    }else if (action.type === ActionTypes.CLOSE_LIFECYCLE_MODAL) {
+        return Object.assign({}, state, {
+            lifecycleModal: {
+                visible: false,
+                nextState: null
+            }
+        });
     }
     return state;
 }

From 6b9d24f8860e8b7330293b351d4022dc040a5450 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 9 May 2019 17:20:56 +0530
Subject: [PATCH 03/13] Create action for change lifecycle

---
 .../react-app/src/js/actions/index.js         | 22 ++++++++++++++++++-
 .../react-app/src/js/constants/ActionTypes.js |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index b64296dea97..f4604d847ec 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -23,7 +23,6 @@ export const getApps = () => dispatch => {
         }
     });
 
-
 };
 
 export const getRelease = (uuid) => dispatch => {
@@ -87,3 +86,24 @@ export const getLifecycle = ()=> dispatch =>{
         }
     });
 };
+
+
+export const updateLifecycleState = (uuid, nextState) => dispatch => {
+
+    const request = "method=get&content-type=application/json&payload={}&api-endpoint=/applications/lifecycle-config/"+uuid+"?action="+nextState;
+
+    return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
+    ).then(res => {
+        if (res.status === 200) {
+            let release = res.data.data;
+            dispatch({type: ActionTypes.GET_RELEASE, payload: release});
+        }
+
+    }).catch(function (error) {
+        if (error.response.status === 401) {
+            window.location.href = 'https://localhost:9443/publisher/login';
+        }
+    });
+
+
+};
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
index cf9dd0f39f1..76ec0da9f7f 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/constants/ActionTypes.js
@@ -8,7 +8,8 @@ const ActionTypes = keyMirror({
     GET_RELEASE: null,
     GET_LIFECYCLE: null,
     OPEN_LIFECYCLE_MODAL: null,
-    CLOSE_LIFECYCLE_MODAL: null
+    CLOSE_LIFECYCLE_MODAL: null,
+    UPDATE_LIFECYCLE_STATE: null,
 });
 
 export default ActionTypes;
\ No newline at end of file

From 25d9569952f26ba4f183dec027983d7b2e05f6b6 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Tue, 14 May 2019 17:29:24 +0530
Subject: [PATCH 04/13] Add APIs for APPM review management

---
 .../pom.xml                                   |   2 -
 .../common/{Review.java => ReviewTmp.java}    |  16 +-
 .../application/mgt/common/dto/ReviewDTO.java |  87 ++++++
 .../mgt/common/response/Review.java           | 106 +++++++
 .../mgt/common/services/ReviewManager.java    |  36 +--
 .../mgt/common/wrapper/ReviewWrapper.java     |  39 +++
 .../application/mgt/core/dao/ReviewDAO.java   |  44 +--
 .../core/dao/impl/Review/ReviewDAOImpl.java   | 278 +++++++++++-------
 .../ApplicationManagementDAOException.java    |   2 -
 .../ReviewManagementDAOException.java         |   2 +-
 .../mgt/core/impl/ReviewManagerImpl.java      | 277 ++++++++++++-----
 .../application/mgt/core/util/APIUtil.java    |   4 +-
 .../application/mgt/core/util/Constants.java  |   2 +
 .../pom.xml                                   |  10 -
 .../api/services/ReviewManagementAPI.java     | 100 +++++--
 .../impl/ReviewManagementAPIImpl.java         |  79 +++--
 .../services/util/CommentMgtTestHelper.java   |  26 +-
 .../dbscripts/cdm/application-mgt/h2.sql      |   3 +-
 18 files changed, 815 insertions(+), 298 deletions(-)
 rename components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/{Review.java => ReviewTmp.java} (87%)
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
index 976bbb84c77..e332baf0be5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
@@ -122,8 +122,6 @@
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
         </dependency>
-
-
     </dependencies>
 </project>
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Review.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewTmp.java
similarity index 87%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Review.java
rename to components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewTmp.java
index e2a488ce3e0..98998dbfebd 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Review.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewTmp.java
@@ -23,8 +23,8 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.sql.Timestamp;
 
-@ApiModel(value = "Review", description = "Review represents the user's review for an application release")
-public class Review {
+@ApiModel(value = "ReviewTmp", description = "ReviewTmp represents the user's review for an application release")
+public class ReviewTmp {
 
     @ApiModelProperty(name = "id",
             value = "The Id given to the comment when it store to the App manager")
@@ -55,9 +55,9 @@ public class Review {
             value = "Rating value of the application release")
     private int rating;
 
-    @ApiModelProperty(name = "replyReview",
+    @ApiModelProperty(name = "replyReviewTmp",
             value = "Replying review")
-    private Review replyReview;
+    private ReviewTmp replyReviewTmp;
 
     public int getId() {
         return id;
@@ -115,12 +115,12 @@ public class Review {
         this.parentId = parentId;
     }
 
-    public Review getReplyReview() {
-        return replyReview;
+    public ReviewTmp getReplyReviewTmp() {
+        return replyReviewTmp;
     }
 
-    public void setReplyReview(Review replyReview) {
-        this.replyReview = replyReview;
+    public void setReplyReviewTmp(ReviewTmp replyReviewTmp) {
+        this.replyReviewTmp = replyReviewTmp;
     }
 }
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java
new file mode 100644
index 00000000000..64cc3a11d2c
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ReviewDTO.java
@@ -0,0 +1,87 @@
+/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.application.mgt.common.dto;
+
+import java.sql.Timestamp;
+
+public class ReviewDTO {
+    private int id;
+    private String content;
+    private String username;
+    private Timestamp createdAt;
+    private Timestamp modifiedAt;
+    private int rating;
+    private int rootParentId;
+    private int immediateParentId;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Timestamp getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Timestamp createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Timestamp getModifiedAt() {
+        return modifiedAt;
+    }
+
+    public void setModifiedAt(Timestamp modifiedAt) {
+        this.modifiedAt = modifiedAt;
+    }
+
+    public int getRating() {
+        return rating;
+    }
+
+    public void setRating(int rating) {
+        this.rating = rating;
+    }
+
+    public int getRootParentId() { return rootParentId; }
+
+    public void setRootParentId(int rootParentId) { this.rootParentId = rootParentId; }
+
+    public int getImmediateParentId() { return immediateParentId; }
+
+    public void setImmediateParentId(int immediateParentId) { this.immediateParentId = immediateParentId; }
+}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java
new file mode 100644
index 00000000000..55140969cbd
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java
@@ -0,0 +1,106 @@
+/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.application.mgt.common.response;
+
+import java.sql.Timestamp;
+import java.util.TreeMap;
+
+public class Review {
+
+    private int id;
+    private String content;
+    private int rootParentId;
+    private int immediateParentId;
+    private String username;
+    private Timestamp createdAt;
+    private Timestamp modifiedAt;
+    private int rating;
+    private TreeMap<Integer, Review> replyComments;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getRootParentId() {
+        return rootParentId;
+    }
+
+    public void setRootParentId(int rootParentId) {
+        this.rootParentId = rootParentId;
+    }
+
+    public int getImmediateParentId() {
+        return immediateParentId;
+    }
+
+    public void setImmediateParentId(int immediateParentId) {
+        this.immediateParentId = immediateParentId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Timestamp getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Timestamp createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Timestamp getModifiedAt() {
+        return modifiedAt;
+    }
+
+    public void setModifiedAt(Timestamp modifiedAt) {
+        this.modifiedAt = modifiedAt;
+    }
+
+    public int getRating() {
+        return rating;
+    }
+
+    public void setRating(int rating) {
+        this.rating = rating;
+    }
+
+    public TreeMap<Integer, Review> getReplyComments() {
+        return replyComments;
+    }
+
+    public void setReplyComments(TreeMap<Integer, Review> replyComments) {
+        this.replyComments = replyComments;
+    }
+}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java
index 82c751feb75..d76ab8f6c88 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ReviewManager.java
@@ -18,16 +18,14 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-import javassist.NotFoundException;
 import org.wso2.carbon.device.application.mgt.common.Rating;
-import org.wso2.carbon.device.application.mgt.common.Review;
+import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.application.mgt.common.PaginationResult;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewDoesNotExistException;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
-
+import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper;
 
 /**
  * ReviewManager is responsible for handling all the add/update/delete/get operations related with
@@ -35,15 +33,16 @@ import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementE
 public interface ReviewManager {
 
     /**
-     * To add a review to an application release
+     * To add a reviewTmp to an application release
      *
-     * @param review  review of the application.
+     * @param reviewWrapper  reviewTmp of the application.
      * @param uuid     uuid of the application release.
-     * @return {@link Review} Review added
-     * @throws ReviewManagementException Exceptions of the review management.
+     * @return {@link ReviewTmp} ReviewTmp added
+     * @throws ReviewManagementException Exceptions of the reviewTmp management.
      */
-    boolean addReview(Review review, String uuid)
-            throws ReviewManagementException, RequestValidatingException, ApplicationManagementException;
+    boolean addReview(ReviewWrapper reviewWrapper, String uuid) throws ReviewManagementException, ApplicationManagementException;
+
+    boolean addReplyComment(ReviewWrapper reviewWrapper, String uuid, int parentReviewId) throws ReviewManagementException, ApplicationManagementException;
 
     /**
      * Get all review with pagination
@@ -67,24 +66,21 @@ public interface ReviewManager {
             throws ReviewManagementException, ReviewDoesNotExistException;
 
     /**
-     * To update a review.
+     * To update a reviewTmp.
      *
-     * @param review   review of the application.
-     * @param reviewId id of the review
+     * @param reviewId id of the reviewTmp
      * @param uuid UUID of the application release
-     * @param existingReview Pass existing review when same user adding a review for same application release,
-     *                       otherwise pass null
-     * @return {@link Review}updated review
-     * @throws ReviewManagementException Exceptions of the review management
+     * @return {@link ReviewTmp}updated reviewTmp
+     * @throws ReviewManagementException Exceptions of the reviewTmp management
      */
-    boolean updateReview(Review review, int reviewId, String uuid, Review existingReview)
-            throws ReviewManagementException, RequestValidatingException;
+    boolean updateReview(ReviewWrapper updatingReview, int reviewId, String uuid)
+            throws ReviewManagementException, ApplicationManagementException;
 
     /**
      * To get the overall rating for a application release
      *
      * @param appReleaseUuuid   UUID of the application release.
-     * @return {@link Review}updated review
+     * @return {@link ReviewTmp}updated review
      * @throws ReviewManagementException Exceptions of the review management
      */
     Rating getRating(String appReleaseUuuid) throws ReviewManagementException;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java
new file mode 100644
index 00000000000..120df8cc1b6
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/wrapper/ReviewWrapper.java
@@ -0,0 +1,39 @@
+/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.application.mgt.common.wrapper;
+
+public class ReviewWrapper {
+    private String content;
+    private int rating;
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getRating() {
+        return rating;
+    }
+
+    public void setRating(int rating) {
+        this.rating = rating;
+    }
+}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java
index 1018bc78b2d..9f705d54c90 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java
@@ -18,8 +18,9 @@
  */
 package org.wso2.carbon.device.application.mgt.core.dao;
 
-import org.wso2.carbon.device.application.mgt.common.Review;
+import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException;
@@ -34,15 +35,15 @@ import java.util.List;
  public interface ReviewDAO {
 
     /**
-     * To add a review to an application release.
+     * To add a reviewTmp to an application release.
      *
      * @param tenantId  tenantId.
-     * @param review   review of the application.
-     * @param uuid UUID of the application release
-     * @return If review is added successfully, it return true otherwise false
-     * @throws ReviewManagementDAOException Exceptions of the review management DAO.
+     * @param reviewDTO   reviewTmp of the application.
+     * @param appReleaseId UUID of the application release
+     * @return If reviewTmp is added successfully, it return true otherwise false
+     * @throws ReviewManagementDAOException Exceptions of the reviewTmp management DAO.
      */
-    boolean addReview(Review review, String uuid, int tenantId) throws ReviewManagementDAOException;
+    boolean addReview(ReviewDTO reviewDTO, int appReleaseId, int tenantId) throws ReviewManagementDAOException;
 
    /**
     * To verify whether user has already commented for the application release or not.
@@ -53,19 +54,19 @@ import java.util.List;
     * @return If review exists, review returns
     * @throws ReviewManagementDAOException Exceptions of the review management DAO.
     */
-    Review haveUerCommented(String uuid, String username, int tenantId) throws ReviewManagementDAOException;
+    boolean haveUerReviewed(int appReleaseId, String username, int tenantId) throws ReviewManagementDAOException;
 
     /**
      * To update already added comment.
      *
-     * @param review Updating review
-     * @param reviewId id of the updating review
-     * @param username review owner
+     * @param reviewDTO Updating reviewTmp
+     * @param reviewId id of the updating reviewTmp
+     * @param username reviewTmp owner
      * @param tenantId tenant id
      * @return row count if updating is succeed otherwise 0
-     * @throws ReviewManagementDAOException Exceptions of the review management.
+     * @throws ReviewManagementDAOException Exceptions of the reviewTmp management.
      */
-    int updateReview(Review review, int reviewId, String username, int tenantId)
+    int updateReview(ReviewDTO reviewDTO, int reviewId, int tenantId)
             throws ReviewManagementDAOException;
 
 
@@ -73,10 +74,13 @@ import java.util.List;
      * To get the comment with id.
      *
      * @param reviewId id of the review
-     * @return {@link Review}Review
+     * @return {@link ReviewTmp}ReviewTmp
      * @throws ReviewManagementDAOException Exceptions of the review management DAO.
      */
-    Review getReview(int reviewId) throws ReviewManagementDAOException;
+    ReviewDTO getReview(int reviewId) throws ReviewManagementDAOException;
+
+    ReviewDTO getReview(int appReleaseId, int reviewId) throws ReviewManagementDAOException;
+
 
     /**
      * To get all reviews
@@ -85,9 +89,9 @@ import java.util.List;
      * @param request {@link PaginationRequest}pagination request with offSet and limit
      * @param tenantId Tenant id
      * @return {@link List}List of all reviews for the application release
-     * @throws ReviewManagementDAOException      Review management DAO exception
+     * @throws ReviewManagementDAOException      ReviewTmp management DAO exception
      **/
-    List<Review> getAllReviews(String uuid, PaginationRequest request, int tenantId)
+    List<ReviewDTO> getAllReviews(String uuid, PaginationRequest request, int tenantId)
             throws ReviewManagementDAOException;
 
     /**
@@ -119,7 +123,7 @@ import java.util.List;
      * @param username username of the review owner
      * @param reviewId id of the review
      * @return If review is successfully deleted return 1, otherwise returns 0.
-     * @throws ReviewManagementDAOException Review management DAO exception.
+     * @throws ReviewManagementDAOException ReviewTmp management DAO exception.
      */
     int deleteReview(String username, int reviewId) throws ReviewManagementDAOException;
 
@@ -137,8 +141,8 @@ import java.util.List;
      * To get review count for a specific application release
      *
      * @param uuid uuid of the application release
-     * @return Review count
-     * @throws ReviewManagementDAOException Review management DAO exception
+     * @return ReviewTmp count
+     * @throws ReviewManagementDAOException ReviewTmp management DAO exception
      */
     int getReviewCount(String uuid) throws ReviewManagementDAOException;
 }
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java
index c5af36b6d42..e4aa49099d9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java
@@ -21,8 +21,9 @@ package org.wso2.carbon.device.application.mgt.core.dao.impl.Review;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.wso2.carbon.device.application.mgt.common.Review;
+import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
+import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.ReviewDAO;
@@ -49,162 +50,227 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
     private String sql;
 
     @Override
-    public boolean addReview(Review review, String uuid, int tenantId) throws ReviewManagementDAOException {
+    public boolean addReview(ReviewDTO reviewDTO, int appReleaseId, int tenantId) throws ReviewManagementDAOException {
         if (log.isDebugEnabled()) {
-            log.debug("Request received in DAO Layer to add review for application release. ApplicationDTO UUID: " + uuid);
+            log.debug("Request received in DAO Layer to add review for application release. Application Release UUID: "
+                    + appReleaseId);
         }
-        PreparedStatement statement = null;
-        ResultSet rs = null;
-        sql = "INSERT INTO AP_APP_REVIEW (TENANT_ID, COMMENT, PARENT_ID, RATING, USERNAME,CREATED_AT, MODIFIED_AT, "
-                + "AP_APP_RELEASE_ID, AP_APP_ID) VALUES (?,?,?,?,?,?,?,(SELECT ID FROM AP_APP_RELEASE WHERE UUID= ?),"
-                + "(SELECT AP_APP_ID FROM AP_APP_RELEASE WHERE UUID=?));";
+        sql = "INSERT INTO AP_APP_REVIEW "
+                + "(TENANT_ID, "
+                + "COMMENT, "
+                + "ROOT_PARENT_ID,"
+                + "IMMEDIATE_PARENT_ID, "
+                + "RATING, "
+                + "USERNAME, "
+                + "CREATED_AT, "
+                + "MODIFIED_AT, "
+                + "AP_APP_RELEASE_ID) "
+                + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ? )";
         try {
             Calendar calendar = Calendar.getInstance();
             Timestamp timestamp = new Timestamp(calendar.getTime().getTime());
 
             Connection conn = this.getDBConnection();
-            statement = conn.prepareStatement(sql, new String[] { "id" });
-            statement.setInt(1, tenantId);
-            statement.setString(2, review.getComment());
-            statement.setInt(3, review.getParentId());
-            statement.setInt(4, review.getRating());
-            statement.setString(5, review.getUsername());
-            statement.setTimestamp(6, timestamp);
-            statement.setTimestamp(7,timestamp);
-            statement.setString(8,uuid);
-            statement.setString(9,uuid);
-            statement.executeUpdate();
-            rs = statement.getGeneratedKeys();
-            return rs.next();
-        }
-        catch (DBConnectionException e) {
+            try (PreparedStatement statement = conn.prepareStatement(sql, new String[] { "id" });) {
+                statement.setInt(1, tenantId);
+                statement.setString(2, reviewDTO.getContent());
+                statement.setInt(3, reviewDTO.getRootParentId());
+                statement.setInt(4, reviewDTO.getImmediateParentId());
+                statement.setInt(5, reviewDTO.getRating());
+                statement.setString(6, reviewDTO.getUsername());
+                statement.setTimestamp(7, timestamp);
+                statement.setTimestamp(8, timestamp);
+                statement.setInt(9, appReleaseId);
+                statement.executeUpdate();
+                try (ResultSet rs = statement.getGeneratedKeys()) {
+                    return rs.next();
+                }
+            }
+        } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException("Error occurred while obtaining the DB connection while "
-                    + "adding review for application UUID:  "+ "Tenant Id: " + tenantId, e);
-        }catch (SQLException e) {
-            throw new ReviewManagementDAOException("Error occurred while getting application list for the tenant"
-                    + " " + tenantId + ". While executing " + sql, e);
-        }  finally {
-            Util.cleanupResources(statement, rs);
+                    + "adding review for application release which has ID:  "+ appReleaseId + "Tenant Id: " + tenantId, e);
+        } catch (SQLException e) {
+            throw new ReviewManagementDAOException(
+                    "Error occurred while executing SQL statement to add application review. Application ID: "
+                            + appReleaseId + " tenant " +  tenantId, e);
         }
     }
 
     @Override
-    public Review haveUerCommented(String uuid, String username, int tenantId) throws ReviewManagementDAOException {
+    public boolean haveUerReviewed(int appReleaseId, String username, int tenantId) throws ReviewManagementDAOException {
         if (log.isDebugEnabled()) {
-            log.debug(
-                    "Request received in DAO Layer to check whether user have already commented or not for the "
-                            + "application release. ApplicationDTO UUID:  " + uuid +  " comment owner: " + username +
-                            " tenant-id " + tenantId);
+            log.debug("Request received in DAO Layer to check whether user have already reviewed or not for the "
+                    + "application release. Commenting user: " + username + " and tenant-id: " + tenantId);
         }
         Connection conn;
-        PreparedStatement statement = null;
-        ResultSet rs = null;
-        Review review = null;
-        sql = "SELECT ID, COMMENT, CREATED_AT, MODIFIED_AT, USERNAME, PARENT_ID, RATING FROM AP_APP_REVIEW WHERE "
-                + "AP_APP_RELEASE_ID = (SELECT ID FROM AP_APP_RELEASE WHERE UUID=?) AND USERNAME = ? AND TENANT_ID = ?;";
+        sql = "SELECT "
+                + "rv.ID "
+                + "FROM AP_APP_REVIEW rv "
+                + "WHERE "
+                + "rv.AP_APP_RELEASE_ID = ? AND "
+                + "rv.USERNAME = ? AND "
+                + "rv.TENANT_ID = ?";
         try {
             conn = this.getDBConnection();
-            statement = conn.prepareStatement(sql);
-            statement.setString(1, uuid);
-            statement.setString(2, username);
-            statement.setInt(3, tenantId);
-            rs = statement.executeQuery();
-            if (rs.next()){
-                review = new Review();
-                review.setId(rs.getInt("ID"));
-                review.setComment(rs.getString("COMMENT"));
-                review.setParentId(rs.getInt("PARENT_ID"));
-                review.setCreatedAt(rs.getTimestamp("CREATED_AT"));
-                review.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
-                review.setUsername(rs.getString("USERNAME"));
-                review.setRating(rs.getInt("RATING"));
+            try (PreparedStatement statement = conn.prepareStatement(sql)) {
+                statement.setInt(1, appReleaseId);
+                statement.setString(2, username);
+                statement.setInt(3, tenantId);
+                try (ResultSet rs = statement.executeQuery()) {
+                    return rs.next();
+
+                }
             }
-            return review;
         } catch (SQLException e) {
             throw new ReviewManagementDAOException("Error occured while accessing the Database when checking whether "
                     + "user has already commented for the application ro not", e);
         } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException("Error occured while getting the database connection when checking "
                     + "whether user has already commented for the application ro not", e);
-
-        } finally {
-            Util.cleanupResources(statement, rs);
         }
     }
 
     @Override
-    public int updateReview(Review review, int reviewId, String username, int tenantId)
+    public int updateReview(ReviewDTO reviewDTO, int reviewId, int tenantId)
             throws ReviewManagementDAOException {
 
         if (log.isDebugEnabled()) {
-            log.debug("Request received in DAO Layer to update the comment with ID (" + reviewId + ")");
+            log.debug("Request received in DAO Layer to update the Review with ID (" + reviewId + ")");
         }
         Connection connection;
         PreparedStatement statement = null;
         ResultSet rs = null;
-        sql = "UPDATE AP_APP_REVIEW SET COMMENT=?, RATING=?, MODIFIED_AT=? WHERE ID=? AND USERNAME=? AND TENANT_ID=?;";
+        sql = "UPDATE "
+                + "AP_APP_REVIEW "
+                + "SET "
+                + "COMMENT = ?, "
+                + "RATING = ?, "
+                + "MODIFIED_AT = ? "
+                + "WHERE ID = ? AND "
+                + "TENANT_ID = ?";
         try {
             Calendar calendar = Calendar.getInstance();
             Timestamp timestamp = new Timestamp(calendar.getTime().getTime());
 
             connection = this.getDBConnection();
             statement = connection.prepareStatement(sql);
-            statement.setString(1, review.getComment());
-            statement.setInt(2, review.getRating());
+            statement.setString(1, reviewDTO.getContent());
+            statement.setInt(2, reviewDTO.getRating());
             statement.setTimestamp(3, timestamp);
             statement.setInt(4, reviewId);
-            statement.setString(5, username);
-            statement.setInt(6, tenantId);
+            statement.setInt(5, tenantId);
             return statement.executeUpdate();
         } catch (SQLException e) {
-            throw new ReviewManagementDAOException("Error occurred while executing review updating query");
+            throw new ReviewManagementDAOException("Error occurred while executing reviewTmp updating query");
         } catch (DBConnectionException e) {
-            throw new ReviewManagementDAOException("Error occured while getting the db connection to update review");
+            throw new ReviewManagementDAOException("Error occured while getting the db connection to update reviewTmp");
         } finally {
             Util.cleanupResources(statement, rs);
         }
     }
 
     @Override
-    public Review getReview(int reviewId) throws ReviewManagementDAOException {
+    public ReviewDTO getReview(int reviewId) throws ReviewManagementDAOException {
 
         if (log.isDebugEnabled()) {
-            log.debug("Getting review with the review id(" + reviewId + ") from the database");
+            log.debug("Getting reviewDTO with the review id(" + reviewId + ") from the database");
         }
         Connection conn;
         PreparedStatement statement = null;
         ResultSet rs = null;
-        Review review = null;
         try {
             conn = this.getDBConnection();
-            sql = "SELECT ID, COMMENT, CREATED_AT, MODIFIED_AT, RATING, USERNAME FROM AP_APP_REVIEW WHERE ID=?;";
+            sql = "SELECT "
+                    + "ID, "
+                    + "COMMENT,"
+                    + "ROOT_PARENT_ID,"
+                    + "IMMEDIATE_PARENT_ID, "
+                    + "CREATED_AT, "
+                    + "MODIFIED_AT, "
+                    + "RATING, "
+                    + "USERNAME "
+                    + "FROM AP_APP_REVIEW "
+                    + "WHERE ID = ?";
             statement = conn.prepareStatement(sql);
             statement.setInt(1, reviewId);
             rs = statement.executeQuery();
             if (rs.next()) {
-                review = new Review();
-                review.setId(rs.getInt("ID"));
-                review.setComment(rs.getString("COMMENT"));
-                review.setCreatedAt(rs.getTimestamp("CREATED_AT"));
-                review.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
-                review.setRating(rs.getInt("RATING"));
-                review.setUsername(rs.getString("USERNAME"));
-                return review;
+                ReviewDTO reviewDTO = new ReviewDTO();
+                reviewDTO.setId(rs.getInt("ID"));
+                reviewDTO.setContent(rs.getString("COMMENT"));
+                reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
+                reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
+                reviewDTO.setRating(rs.getInt("RATING"));
+                reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
+                reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
+                reviewDTO.setUsername(rs.getString("USERNAME"));
+                return reviewDTO;
             }
+            return null;
         } catch (SQLException e) {
             throw new ReviewManagementDAOException(
-                    "SQL Error occurred while retrieving information of the review " + reviewId, e);
+                    "SQL Error occurred while retrieving information of the reviewTmp " + reviewId, e);
         } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException(
-                    "DB Connection Exception occurred while retrieving information of the review " + reviewId, e);
+                    "DB Connection Exception occurred while retrieving information of the reviewTmp " + reviewId, e);
         } finally {
             Util.cleanupResources(statement, rs);
         }
-        return review;
     }
 
     @Override
-    public List<Review> getAllReviews(String uuid, PaginationRequest request, int tenantId)
+    public ReviewDTO getReview(int appReleaseId, int reviewId) throws ReviewManagementDAOException {
+        if (log.isDebugEnabled()) {
+            log.debug("Getting reviewDTO with the review id(" + reviewId + ") from the database");
+        }
+        Connection conn;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        try {
+            conn = this.getDBConnection();
+            sql = "SELECT "
+                    + "ID, "
+                    + "COMMENT,"
+                    + "ROOT_PARENT_ID,"
+                    + "IMMEDIATE_PARENT_ID, "
+                    + "CREATED_AT, "
+                    + "MODIFIED_AT, "
+                    + "RATING, "
+                    + "USERNAME "
+                    + "FROM AP_APP_REVIEW "
+                    + "WHERE ID = ? AND "
+                    + "AP_APP_RELEASE_ID = ?";
+            statement = conn.prepareStatement(sql);
+            statement.setInt(1, reviewId);
+            statement.setInt(2, appReleaseId);
+            rs = statement.executeQuery();
+            if (rs.next()) {
+                ReviewDTO reviewDTO = new ReviewDTO();
+                reviewDTO.setId(rs.getInt("ID"));
+                reviewDTO.setContent(rs.getString("COMMENT"));
+                reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
+                reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
+                reviewDTO.setRating(rs.getInt("RATING"));
+                reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
+                reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
+                reviewDTO.setUsername(rs.getString("USERNAME"));
+                return reviewDTO;
+            }
+            return null;
+        } catch (SQLException e) {
+            throw new ReviewManagementDAOException(
+                    "SQL Error occurred while retrieving information of the reviewTmp " + reviewId, e);
+        } catch (DBConnectionException e) {
+            throw new ReviewManagementDAOException(
+                    "DB Connection Exception occurred while retrieving information of the reviewTmp " + reviewId, e);
+        } finally {
+            Util.cleanupResources(statement, rs);
+        }
+    }
+
+
+    @Override
+    public List<ReviewDTO> getAllReviews(String uuid, PaginationRequest request, int tenantId)
             throws ReviewManagementDAOException {
 
         if (log.isDebugEnabled()) {
@@ -213,16 +279,25 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
         Connection conn;
         PreparedStatement statement = null;
         ResultSet rs = null;
-        List<Review> reviews = new ArrayList<>();
+        List<ReviewDTO> reviewDTOs = new ArrayList<>();
         try {
             conn = this.getDBConnection();
-            sql = "SELECT AP_APP_REVIEW.ID AS ID, AP_APP_REVIEW.COMMENT AS COMMENT, "
-                    + "AP_APP_REVIEW.CREATED_AT AS CREATED_AT, AP_APP_REVIEW.MODIFIED_AT AS MODIFIED_AT, "
-                    + "AP_APP_REVIEW.USERNAME AS USERNAME, AP_APP_REVIEW.PARENT_ID AS PARENT_ID, "
-                    + "AP_APP_REVIEW.RATING AS RATING FROM AP_APP_REVIEW, AP_APP_RELEASE WHERE "
-                    + "AP_APP_REVIEW.AP_APP_RELEASE_ID=AP_APP_RELEASE.ID AND AP_APP_RELEASE.UUID =? "
-                    + "AND AP_APP_REVIEW.TENANT_ID = ? AND "
-                    + "AP_APP_REVIEW.TENANT_ID = AP_APP_RELEASE.TENANT_ID LIMIT ? OFFSET ?;";
+            sql = "SELECT "
+                    + "AP_APP_REVIEW.ID AS ID, "
+                    + "AP_APP_REVIEW.COMMENT AS COMMENT, "
+                    + "AP_APP_REVIEW.CREATED_AT AS CREATED_AT, "
+                    + "AP_APP_REVIEW.MODIFIED_AT AS MODIFIED_AT, "
+                    + "AP_APP_REVIEW.USERNAME AS USERNAME, "
+                    + "AP_APP_REVIEW.ROOT_PARENT_ID AS ROOT_PARENT_ID, "
+                    + "AP_APP_REVIEW.IMMEDIATE_PARENT_ID AS IMMEDIATE_PARENT_ID, "
+                    + "AP_APP_REVIEW.RATING AS RATING "
+                    + "FROM AP_APP_REVIEW, AP_APP_RELEASE "
+                    + "WHERE "
+                    + "AP_APP_REVIEW.AP_APP_RELEASE_ID=AP_APP_RELEASE.ID AND "
+                    + "AP_APP_RELEASE.UUID = ? AND "
+                    + "AP_APP_REVIEW.TENANT_ID = ? AND "
+                    + "AP_APP_REVIEW.TENANT_ID = AP_APP_RELEASE.TENANT_ID "
+                    + "LIMIT ? OFFSET ?;";
             statement = conn.prepareStatement(sql);
             statement.setString(1, uuid);
             statement.setInt(2, tenantId);
@@ -230,25 +305,26 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
             statement.setInt(4, request.getOffSet());
             rs = statement.executeQuery();
             while (rs.next()) {
-                Review review = new Review();
-                review.setId(rs.getInt("ID"));
-                review.setComment(rs.getString("COMMENT"));
-                review.setCreatedAt(rs.getTimestamp("CREATED_AT"));
-                review.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
-                review.setParentId(rs.getInt("PARENT_ID"));
-                review.setUsername(rs.getString("USERNAME"));
-                review.setRating(rs.getInt("RATING"));
-                reviews.add(review);
+                ReviewDTO reviewDTO = new ReviewDTO();
+                reviewDTO.setId(rs.getInt("ID"));
+                reviewDTO.setContent(rs.getString("COMMENT"));
+                reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
+                reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
+                reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
+                reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
+                reviewDTO.setUsername(rs.getString("USERNAME"));
+                reviewDTO.setRating(rs.getInt("RATING"));
+                reviewDTOs.add(reviewDTO);
             }
         }  catch (DBConnectionException e) {
             throw new ReviewManagementDAOException(
                     "Error occurred while obtaining the DB connection when verifying application existence", e);
         } catch (SQLException e) {
-            throw new ReviewManagementDAOException("DB connection error occurred while getting all reviews", e);
+            throw new ReviewManagementDAOException("DB connection error occurred while getting all reviewTmps", e);
         }finally {
             Util.cleanupResources(statement, rs);
         }
-        return reviews;
+        return reviewDTOs;
     }
 
     @Override
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java
index ccadcab072d..d946ee3fcee 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java
@@ -16,8 +16,6 @@
  */
 package org.wso2.carbon.device.application.mgt.core.exception;
 
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-
 /**
  * Exception thrown during the ApplicationDTO Management DAO operations.
  */
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java
index f32f08b3244..56cb3ff3bac 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ReviewManagementDAOException.java
@@ -21,7 +21,7 @@ package org.wso2.carbon.device.application.mgt.core.exception;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
 
 /**
- * Exception thrown during the Review Management DAO operations.
+ * Exception thrown during the ReviewTmp Management DAO operations.
  */
 public class ReviewManagementDAOException extends ReviewManagementException {
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
index ed50b02407a..b3b4047d81b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
@@ -22,17 +22,25 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.application.mgt.common.Rating;
-import org.wso2.carbon.device.application.mgt.common.Review;
+import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.application.mgt.common.PaginationResult;
+import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO;
+import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO;
+import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewDoesNotExistException;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
+import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException;
+import org.wso2.carbon.device.application.mgt.common.response.Review;
 import org.wso2.carbon.device.application.mgt.common.services.*;
+import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper;
 import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.ReviewDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
+import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
+import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException;
 import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
 import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException;
 import org.wso2.carbon.device.application.mgt.core.internal.DataHolder;
@@ -42,6 +50,7 @@ import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.TreeMap;
 
@@ -64,34 +73,120 @@ public class ReviewManagerImpl implements ReviewManager {
     }
 
     @Override
-    public boolean addReview(Review review, String uuid) throws ReviewManagementException, NotFoundException {
+    public boolean addReview(ReviewWrapper reviewWrapper, String uuid)
+            throws ReviewManagementException, ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
-        boolean isSuccess = false;
+
+        if (reviewWrapper == null) {
+            String msg = "Request payload is null. Please verify the request payload.";
+            log.error(msg);
+            throw new BadRequestException(msg);
+        }
+        if (reviewWrapper.getRating() < 0) {
+            String msg = "You are trying to add invalid rating value as rating. Therefore please verify the request "
+                    + "payload.";
+            log.error(msg);
+            throw new BadRequestException(msg);
+        }
         try {
-            ConnectionManagerUtil.openDBConnection();
-            if (!this.applicationReleaseDAO.verifyReleaseExistenceByUuid(uuid, tenantId)){
-                throw new NotFoundException("Couldn't find application release for the application UUID: " + uuid);
+            ConnectionManagerUtil.beginDBTransaction();
+            ApplicationReleaseDTO applicationReleaseDTO = this.applicationReleaseDAO.getReleaseByUUID(uuid, tenantId);
+            if (applicationReleaseDTO == null) {
+                String msg = "Couldn't find application release for the application UUID: " + uuid;
+                log.error(msg);
+                throw new NotFoundException(msg);
             }
-            Review existingReview = this.reviewDAO.haveUerCommented(uuid, username, tenantId);
-            if (existingReview != null && isAuthorizedUser(username, existingReview.getUsername(), tenantId)
-                    && review.getRating() > 0 && review.getRating() != existingReview.getRating()) {
-                Runnable task = () -> calculateRating(review.getRating(), existingReview.getRating(), uuid, tenantId);
-                new Thread(task).start();
-                isSuccess = updateReview(review, existingReview.getId(), uuid, existingReview);
-            } else if (review.getRating() > 0) {
-                Runnable task = () -> calculateRating(review.getRating(), -12345, uuid, tenantId);
-                new Thread(task).start();
-                review.setUsername(username);
-                isSuccess = this.reviewDAO.addReview(review, uuid, tenantId);
+            if (this.reviewDAO.haveUerReviewed(applicationReleaseDTO.getId(), username, tenantId)) {
+                String msg =
+                        "User " + username + " has already reviewed the application release which has UUID: " + uuid
+                                + ". Hence you can't add another review for same application release. But you can update "
+                                + "the review that you have already added for ths application release.";
+                log.error(msg);
+                throw new ForbiddenException(msg);
+            }
+            Runnable task = () -> calculateRating(reviewWrapper.getRating(), -12345, uuid, tenantId);
+            new Thread(task).start();
+
+            ReviewDTO reviewDTO = reviewWrapperToDO(reviewWrapper);
+            reviewDTO.setUsername(username);
+            reviewDTO.setRootParentId(-1);
+            reviewDTO.setImmediateParentId(-1);
+            if (this.reviewDAO.addReview(reviewDTO, applicationReleaseDTO.getId(), tenantId)) {
+                ConnectionManagerUtil.commitDBTransaction();
+                return true;
             }
-            return isSuccess;
+            ConnectionManagerUtil.rollbackDBTransaction();
+            return false;
+        } catch (DBConnectionException e) {
+            String msg = "DB Connection error occurs when adding Review for application release with UUID: " + uuid
+                    + " is failed";
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
+        } catch (TransactionManagementException e) {
+            String msg = "DB transaction error occurred when adding review for application release which has "
+                    + "application UUID: " + uuid;
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
+        } catch (ApplicationManagementDAOException e) {
+            String msg = "Error occurred when getting application release data for application release UUID:." + uuid;
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
+        } catch (ReviewManagementDAOException e) {
+            ConnectionManagerUtil.rollbackDBTransaction();
+            String msg = "Error occurred when getting review data or adding review data for application release which "
+                    + "has UUID: " + uuid;
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
+        } finally {
+            ConnectionManagerUtil.closeDBConnection();
+        }
+    }
+
+    @Override
+    public boolean addReplyComment(ReviewWrapper reviewWrapper, String uuid, int parentReviewId)
+            throws ReviewManagementException, NotFoundException, BadRequestException {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+        String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
+
+        if (reviewWrapper == null) {
+            String msg = "Request payload is null. Please verify the request payload.";
+            log.error(msg);
+            throw new BadRequestException(msg);
+        }
+        try {
+            ConnectionManagerUtil.beginDBTransaction();
+            ApplicationReleaseDTO applicationReleaseDTO = this.applicationReleaseDAO.getReleaseByUUID(uuid, tenantId);
+            if (applicationReleaseDTO == null) {
+                String msg = "Couldn't find application release for the application UUID: " + uuid;
+                log.error(msg);
+                throw new NotFoundException(msg);
+            }
+            ReviewDTO parentReview = this.reviewDAO.getReview(applicationReleaseDTO.getId(), parentReviewId);
+            if (parentReview == null) {
+                String msg = "Couldn't find an review which has review ID: " + parentReviewId
+                        + " for application release which has UUID: " + uuid;
+                log.error(msg);
+                throw new BadRequestException(msg);
+            }
+            ReviewDTO replyComment = reviewWrapperToDO(reviewWrapper);
+            replyComment.setUsername(username);
+            replyComment.setRootParentId(parentReview.getRootParentId());
+            replyComment.setImmediateParentId(parentReview.getId());
+            if (this.reviewDAO.addReview(replyComment, applicationReleaseDTO.getId(), tenantId)) {
+                ConnectionManagerUtil.commitDBTransaction();
+                return true;
+            }
+            return false;
         } catch (DBConnectionException e) {
             throw new ReviewManagementException(
-                    "DB Connection error occurs ,Review for application release with UUID: " + uuid +  " is failed", e);
-        }  catch (UserStoreException e) {
-            throw new ReviewManagementException("Error occured while verifying user's permission to update the review.",
+                    "DB Connection error occurs ,ReviewTmp for application release with UUID: " + uuid + " is failed",
                     e);
+        } catch (TransactionManagementException e) {
+            String msg = "DB transaction error occurred when adding reply comment for comment which has comment id: "
+                    + parentReviewId;
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
         } catch (ApplicationManagementDAOException e) {
             throw new ReviewManagementException(
                     "Error occured while verifying whether application release is exists or not.", e);
@@ -100,54 +195,85 @@ public class ReviewManagerImpl implements ReviewManager {
         }
     }
 
+    private ReviewDTO reviewWrapperToDO(ReviewWrapper reviewWrapper){
+        ReviewDTO reviewDTO = new ReviewDTO();
+        reviewDTO.setContent(reviewWrapper.getContent());
+        reviewDTO.setRating(reviewWrapper.getRating());
+        return reviewDTO;
+    }
+
+    private List<Review> reviewDTOToReview(List<ReviewDTO> reviewDTOs){
+        List<Review> reviews = new ArrayList<>();
+
+        for (ReviewDTO reviewDTO : reviewDTOs){
+            Review review = new Review();
+            review.setId(reviewDTO.getId());
+            review.setContent(reviewDTO.getContent());
+            review.setRootParentId(reviewDTO.getRootParentId());
+            review.setImmediateParentId(reviewDTO.getImmediateParentId());
+            review.setCreatedAt(reviewDTO.getCreatedAt());
+            review.setModifiedAt(reviewDTO.getModifiedAt());
+            review.setReplyComments(new TreeMap<>());
+            reviews.add(review);
+        }
+        return reviews;
+    }
+
     @Override
-    public boolean updateReview(Review review, int reviewId, String uuid, Review existingReview)
-            throws ReviewManagementException {
+    public boolean updateReview(ReviewWrapper updatingReview, int reviewId, String uuid)
+            throws ReviewManagementException, ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
-        boolean isConnectionOpen = false;
         if (log.isDebugEnabled()) {
-            log.debug("Review updating request is received for the review id " + reviewId);
+            log.debug("ReviewTmp updating request is received for the reviewTmp id " + reviewId);
         }
         try {
-            if (existingReview == null) {
-                ConnectionManagerUtil.openDBConnection();
-                isConnectionOpen = true;
-                existingReview = this.reviewDAO.getReview(reviewId);
-                if (existingReview != null && isAuthorizedUser(username, existingReview.getUsername(), tenantId)) {
-                    if (review.getRating() > 0 && review.getRating() != existingReview.getRating()) {
-                        Review finalExistingReview = existingReview;
-                        Runnable task = () -> calculateRating(review.getRating(), finalExistingReview.getRating(),
-                                uuid, tenantId);
-                        new Thread(task).start();
-                    }
-                } else {
-                    throw new ReviewManagementException(
-                            "Please check the existence of the review, Review-Id: " + reviewId
-                                    + " or permission of the " + username + " to update the review.");
-                }
+            ConnectionManagerUtil.openDBConnection();
+            ApplicationReleaseDTO applicationReleaseDTO = this.applicationReleaseDAO.getReleaseByUUID(uuid, tenantId);
+            if (applicationReleaseDTO == null) {
+                String msg = "Couldn't found an application release for UUID: " + uuid;
+                log.error(msg);
+                throw new NotFoundException(msg);
             }
-            if (review.getComment().isEmpty()) {
-                review.setComment(existingReview.getComment());
+            ReviewDTO reviewDTO = this.reviewDAO.getReview(applicationReleaseDTO.getId(), reviewId);
+            if (reviewDTO == null) {
+                String msg =
+                        "Couldn't found a review for application release which has UUID: " + uuid + " and review ID: "
+                                + reviewId;
+                log.error(msg);
+                throw new NotFoundException(msg);
             }
-            if (review.getRating() == 0) {
-                review.setRating(existingReview.getRating());
+
+            if (!username.equals(reviewDTO.getUsername())) {
+                String msg = "You are trying to update a review which is triggered by " + reviewDTO.getUsername()
+                        + ". Hence you are not permitted to update the review.";
+                log.error(msg);
+                throw new ForbiddenException(msg);
+            }
+
+            if (reviewDTO.getRootParentId() == -1 && reviewDTO.getImmediateParentId() == -1
+                    && updatingReview.getRating() > 0 && updatingReview.getRating() != reviewDTO.getRating()) {
+                Runnable task = () -> calculateRating(updatingReview.getRating(), reviewDTO.getRating(), uuid,
+                        tenantId);
+                new Thread(task).start();
+                reviewDTO.setRating(updatingReview.getRating());
             }
-            return this.reviewDAO.updateReview(review, reviewId, username, tenantId) == 1;
+            reviewDTO.setContent(updatingReview.getContent());
+            return this.reviewDAO.updateReview(reviewDTO, reviewId, tenantId) == 1;
         } catch (ReviewManagementDAOException e) {
-            throw new ReviewManagementException("Error occured while  getting review with review id " + reviewId + ".",
-                    e);
+            String msg = "Error occured while  getting reviewTmp with reviewTmp id " + reviewId + ".";
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
         } catch (DBConnectionException e) {
-            throw new ReviewManagementException(
-                    "DB Connection error occurs updating review with review id " + reviewId + ".", e);
-        } catch (UserStoreException e) {
-            throw new ReviewManagementException(
-                    "Error occured while verifying user's permission to update the review. review id: " + reviewId
-                            + ".", e);
+            String msg = "DB Connection error occurs updating reviewTmp with reviewTmp id " + reviewId + ".";
+            log.error(msg);
+            throw new ReviewManagementException(msg, e);
+        } catch (ApplicationManagementDAOException e) {
+            String msg = "Error occured when getting application release data for application release UUID: " + uuid;
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
         } finally {
-            if (isConnectionOpen) {
-                ConnectionManagerUtil.closeDBConnection();
-            }
+            ConnectionManagerUtil.closeDBConnection();
         }
     }
 
@@ -157,37 +283,44 @@ public class ReviewManagerImpl implements ReviewManager {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         PaginationResult paginationResult = new PaginationResult();
         int numOfComments;
-        List<Review> reviews;
-        TreeMap<Integer, Review> hierarchicalReviewSet = new TreeMap<>();
+        TreeMap<Integer, Review> reviewTree = new TreeMap<>();
         if (log.isDebugEnabled()) {
-            log.debug("Get all reviews of the application release uuid: " + uuid);
+            log.debug("Get all reviewTmps of the application release uuid: " + uuid);
         }
         try {
             ConnectionManagerUtil.openDBConnection();
-            reviews = this.reviewDAO.getAllReviews(uuid, request, tenantId);
+            List<ReviewDTO> reviewDTOs= this.reviewDAO.getAllReviews(uuid, request, tenantId);
+            List<Review> reviews = reviewDTOToReview(reviewDTOs);
+            reviews.sort(Comparator.comparing(Review::getId));
 
             for (Review review : reviews) {
-                if (hierarchicalReviewSet.containsKey(review.getParentId())) {
-                    Review parentReview = hierarchicalReviewSet.get(review.getParentId());
-                    parentReview.setReplyReview(review);
-                    hierarchicalReviewSet.replace(review.getParentId(), parentReview);
-                } else {
-                    hierarchicalReviewSet.put(review.getId(), review);
+                if (review.getRootParentId() == -1 && review.getImmediateParentId() == -1) {
+                    reviewTree.put(review.getId(), review);
+                } else if (reviewTree.containsKey(review.getRootParentId())) {
+                    if (review.getRootParentId() == review.getImmediateParentId()) {
+                        reviewTree.get(review.getRootParentId()).getReplyComments().put(review.getId(), review);
+                    } else if (reviewTree.get(review.getRootParentId()).getReplyComments()
+                            .containsKey(review.getImmediateParentId())) {
+                        reviewTree.get(review.getRootParentId()).getReplyComments().get(review.getImmediateParentId())
+                                .getReplyComments().put(review.getId(), review);
+                    } else {
+                        //todo traverse and find
+                    }
                 }
             }
-            numOfComments = hierarchicalReviewSet.size();
+            numOfComments = reviewTree.size();
             if (numOfComments > 0) {
-                paginationResult.setData(new ArrayList<>(hierarchicalReviewSet.values()));
+                paginationResult.setData(new ArrayList<>(reviewTree.values()));
                 paginationResult.setRecordsFiltered(numOfComments);
                 paginationResult.setRecordsTotal(numOfComments);
             } else {
-                paginationResult.setData(new ArrayList<Review>());
+                paginationResult.setData(new ArrayList<ReviewTmp>());
                 paginationResult.setRecordsFiltered(0);
                 paginationResult.setRecordsTotal(0);
             }
             return paginationResult;
         } catch (ReviewManagementDAOException e) {
-            throw new ReviewManagementException("Error occured while getting all reviews for application uuid: " + uuid,
+            throw new ReviewManagementException("Error occured while getting all reviewTmps for application uuid: " + uuid,
                     e);
         } catch (DBConnectionException e) {
             throw new ReviewManagementException("Error occured while getting the DB connection.", e);
@@ -199,7 +332,7 @@ public class ReviewManagerImpl implements ReviewManager {
     @Override
     public boolean deleteReview(String uuid, int reviewId)
             throws ReviewManagementException, ReviewDoesNotExistException {
-        Review existingReview;
+        ReviewDTO existingReview;
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
         try {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
index d4cc2f72c74..d3ae664f320 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
@@ -120,7 +120,7 @@ public class APIUtil {
     }
 
     /**
-     * To get the Review Manager from the osgi context.
+     * To get the ReviewTmp Manager from the osgi context.
      * @return ReviewManager instance in the current osgi context.
      */
     public static ReviewManager getReviewManager() {
@@ -131,7 +131,7 @@ public class APIUtil {
                     reviewManager =
                             (ReviewManager) ctx.getOSGiService(ReviewManager.class, null);
                     if (reviewManager == null) {
-                        String msg = "Review Manager service has not initialized.";
+                        String msg = "ReviewTmp Manager service has not initialized.";
                         log.error(msg);
                         throw new IllegalStateException(msg);
                     }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java
index d883ad454b7..1b9695659f7 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java
@@ -63,4 +63,6 @@ public class Constants {
      * Directory name of the release artifacts that are saved in the file system.
      */
     public static final String RELEASE_ARTIFACT = "artifact";
+
+    public static final int MAXIMUM_REVIEWS_PER_USER = 10;
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
index ae5daccb491..d0a291c5446 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
@@ -157,16 +157,6 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java
index 045e5163b0d..aea3990e5ee 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java
@@ -32,7 +32,9 @@ import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.application.mgt.common.PaginationResult;
 import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.application.mgt.common.Review;
+import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
+import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper;
+
 import javax.validation.Valid;
 import javax.ws.rs.Path;
 import javax.ws.rs.Consumes;
@@ -63,19 +65,19 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "review_management", description = "Review Management related APIs")
+                @Tag(name = "review_management", description = "ReviewTmp Management related APIs")
         }
 )
 @Scopes(
         scopes = {
                 @Scope(
-                        name = "Get Review Details",
+                        name = "Get ReviewTmp Details",
                         description = "Get review details",
                         key = "perm:app:review:view",
                         permissions = {"/app-mgt/store/review/view"}
                 ),
                 @Scope(
-                        name = "Update a Review",
+                        name = "Update a ReviewTmp",
                         description = "Update a comment",
                         key = "perm:app:review:update",
                         permissions = {"/app-mgt/store/review/update"}
@@ -84,7 +86,7 @@ import java.util.List;
 )
 
 @Path("/review")
-@Api(value = "Review Management", description = "This API carries all review management related operations such as get "
+@Api(value = "ReviewTmp Management", description = "This API carries all review management related operations such as get "
         + "all the reviews, add review, etc.")
 @Produces(MediaType.APPLICATION_JSON)
 public interface ReviewManagementAPI {
@@ -144,12 +146,12 @@ public interface ReviewManagementAPI {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Add a review",
-            notes = "This will add a new review",
+            value = "Add a reviewTmp",
+            notes = "This will add a new reviewTmp",
             tags = "Store Management",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:review:update")
+                            @ExtensionProperty(name = SCOPE, value = "perm:app:reviewTmp:update")
                     })
             }
     )
@@ -158,29 +160,79 @@ public interface ReviewManagementAPI {
             value = {
                     @ApiResponse(
                             code = 201,
-                            message = "OK. \n Successfully add a review.",
-                            response = Review.class),
+                            message = "OK. \n Successfully add a reviewTmp.",
+                            response = ReviewTmp.class),
                     @ApiResponse(
                             code = 400,
                             message =
                                     "Bad Request. \n"),
                     @ApiResponse(
                             code = 500,
-                            message = "Internal Server Error. \n Error occurred adding a review.",
+                            message = "Internal Server Error. \n Error occurred adding a reviewTmp.",
                             response = ErrorResponse.class)
             })
 
     Response addReview(
             @ApiParam(
-                    name = "review",
-                    value = "Review details",
-                    required = true) Review review,
+                    name = "reviewTmp",
+                    value = "ReviewTmp details",
+                    required = true) ReviewWrapper reviewWrapper,
             @ApiParam(
                     name="uuid",
                     value="uuid of the release version of the application",
                     required=true)
             @PathParam("uuid") String uuid);
 
+            @POST
+            @Path("/{uuid}/{parentReviewId}")
+            @Produces(MediaType.APPLICATION_JSON)
+            @Consumes(MediaType.APPLICATION_JSON)
+            @ApiOperation(
+                    consumes = MediaType.APPLICATION_JSON,
+                    produces = MediaType.APPLICATION_JSON,
+                    httpMethod = "POST",
+                    value = "Add a reviewTmp",
+                    notes = "This will add a new reviewTmp",
+                    tags = "Store Management",
+                    extensions = {
+                            @Extension(properties = {
+                                    @ExtensionProperty(name = SCOPE, value = "perm:app:reviewTmp:update")
+                            })
+                    }
+            )
+
+            @ApiResponses(
+                    value = {
+                            @ApiResponse(
+                                    code = 201,
+                                    message = "OK. \n Successfully add a reviewTmp.",
+                                    response = ReviewTmp.class),
+                            @ApiResponse(
+                                    code = 400,
+                                    message =
+                                            "Bad Request. \n"),
+                            @ApiResponse(
+                                    code = 500,
+                                    message = "Internal Server Error. \n Error occurred adding a reviewTmp.",
+                                    response = ErrorResponse.class)
+                    })
+
+            Response addReplyComment(
+                    @ApiParam(
+                            name = "reviewTmp",
+                            value = "ReviewTmp details",
+                            required = true) ReviewWrapper reviewWrapper,
+                    @ApiParam(
+                            name="uuid",
+                            value="uuid of the release version of the application",
+                            required=true)
+                    @PathParam("uuid") String uuid,
+                    @ApiParam(
+                            name="parentReviewId",
+                            value="uuid of the release version of the application",
+                            required=true)
+                    @PathParam("parentReviewId") int parentReviewId);
+
     @PUT
     @Path("/{uuid}/{reviewId}")
     @Produces(MediaType.APPLICATION_JSON)
@@ -189,12 +241,12 @@ public interface ReviewManagementAPI {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Edit a review",
-            notes = "This will edit the review",
+            value = "Edit a reviewTmp",
+            notes = "This will edit the reviewTmp",
             tags = "Store Management",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:review:update")
+                            @ExtensionProperty(name = SCOPE, value = "perm:app:reviewTmp:update")
                     })
             }
     )
@@ -202,22 +254,22 @@ public interface ReviewManagementAPI {
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Successfully updated review.",
-                            response = Review.class),
+                            message = "OK. \n Successfully updated reviewTmp.",
+                            response = ReviewTmp.class),
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error."),
                     @ApiResponse(
                             code = 500,
-                            message = "Internal Server Error. \n Error occurred while updating the new review.",
+                            message = "Internal Server Error. \n Error occurred while updating the new reviewTmp.",
                             response = ErrorResponse.class)
             })
     Response updateReview(
             @ApiParam(
-                    name = "review",
-                    value = "The review that need to be updated.",
+                    name = "reviewTmp",
+                    value = "The reviewTmp that need to be updated.",
                     required = true)
-            @Valid Review review,
+            @Valid ReviewWrapper updatingReview,
             @ApiParam(
                     name="uuid",
                     value = "uuid of the application release",
@@ -225,7 +277,7 @@ public interface ReviewManagementAPI {
             @PathParam("uuid") String uuid,
             @ApiParam(
                     name="reviewId",
-                    value = "review id of the updating review.",
+                    value = "reviewTmp id of the updating reviewTmp.",
                     required = true)
             @PathParam("reviewId") int reviewId);
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
index da6a6a72283..5fb81372298 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
@@ -23,10 +23,10 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.application.mgt.common.PaginationResult;
 import org.wso2.carbon.device.application.mgt.common.Rating;
-import org.wso2.carbon.device.application.mgt.common.Review;
-import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewDoesNotExistException;
 import org.wso2.carbon.device.application.mgt.common.services.ReviewManager;
+import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper;
+import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException;
 import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
 import org.wso2.carbon.device.application.mgt.store.api.services.ReviewManagementAPI;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
@@ -46,7 +46,7 @@ import javax.ws.rs.DELETE;
 import javax.ws.rs.core.Response;
 
 /**
- * Review Management related jax-rs APIs.
+ * ReviewTmp Management related jax-rs APIs.
  */
 @Path("/review")
 public class ReviewManagementAPIImpl implements ReviewManagementAPI {
@@ -77,15 +77,15 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
     @Consumes("application/json")
     @Path("/{uuid}")
     public Response addReview(
-            @ApiParam Review review,
+            @ApiParam ReviewWrapper reviewWrapper,
             @PathParam("uuid") String uuid) {
         ReviewManager reviewManager = APIUtil.getReviewManager();
         try {
-            boolean isReviewCreated = reviewManager.addReview(review, uuid);
+            boolean isReviewCreated = reviewManager.addReview(reviewWrapper, uuid);
             if (isReviewCreated) {
-                return Response.status(Response.Status.CREATED).entity(review).build();
+                return Response.status(Response.Status.CREATED).entity(reviewWrapper).build();
             } else {
-                String msg = "Given review is not valid. Please check the review payload.";
+                String msg = "Given reviewTmp is not valid. Please check the reviewTmp payload.";
                 log.error(msg);
                 return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
             }
@@ -94,14 +94,42 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
             log.error(msg, e);
             return Response.status(Response.Status.NOT_FOUND).entity(msg).build();
         } catch (ReviewManagementException e) {
-            String msg = "Error occurred while creating the review";
+            String msg = "Error occurred while creating the reviewTmp";
             log.error(msg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
-        } catch (RequestValidatingException e) {
-            String msg =
-                    "Error occurred while adding for application release. UUID of the application release: " + uuid;
+        } catch (ApplicationManagementException e) {
+            String msg = "Error occured while accessing application release for UUID: " + uuid;
             log.error(msg, e);
-            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        }
+    }
+
+    @Override
+    @POST
+    @Consumes("application/json")
+    @Path("/{uuid}/{parentReviewId}")
+    public Response addReplyComment(
+            @ApiParam ReviewWrapper reviewWrapper,
+            @PathParam("uuid") String uuid,
+            @PathParam("parentReviewId") int parentReviewId) {
+        ReviewManager reviewManager = APIUtil.getReviewManager();
+        try {
+            boolean isRepliedForReview = reviewManager.addReplyComment(reviewWrapper, uuid, parentReviewId);
+            if (isRepliedForReview) {
+                return Response.status(Response.Status.CREATED).entity(reviewWrapper).build();
+            } else {
+                String msg = "Given reviewTmp is not valid. Please check the reviewTmp payload.";
+                log.error(msg);
+                return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
+            }
+        } catch (NotFoundException e) {
+            String msg = "Couldn't find an application release for UUID: " + uuid;
+            log.error(msg, e);
+            return Response.status(Response.Status.NOT_FOUND).entity(msg).build();
+        } catch (ReviewManagementException e) {
+            String msg = "Error occurred while creating the reviewTmp";
+            log.error(msg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
         } catch (ApplicationManagementException e) {
             String msg = "Error occured while accessing application release for UUID: " + uuid;
             log.error(msg, e);
@@ -114,13 +142,13 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
     @Consumes("application/json")
     @Path("/{uuid}/{reviewId}")
     public Response updateReview(
-            @ApiParam Review review,
+            @ApiParam ReviewWrapper updatingReview,
             @PathParam("uuid") String uuid,
             @PathParam("reviewId") int reviewId) {
         ReviewManager reviewManager = APIUtil.getReviewManager();
         try {
-            if (reviewManager.updateReview(review, reviewId, uuid, null)) {
-                return Response.status(Response.Status.OK).entity(review).build();
+            if (reviewManager.updateReview(updatingReview, reviewId, uuid)) {
+                return Response.status(Response.Status.OK).entity(updatingReview).build();
             } else {
                 String msg = "Review updating failed. Please contact the administrator";
                 log.error(msg);
@@ -130,11 +158,18 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
             String msg = "Error occurred while retrieving comments.";
             log.error(msg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
-        } catch (RequestValidatingException e) {
-            String msg = "Error occurred while updating review. Review id: " + reviewId;
+        } catch (NotFoundException e) {
+            String msg = "Couldn't found application release data for UUID " + uuid + " or Review for review ID: " + reviewId;
             log.error(msg, e);
-            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
-        }
+            return Response.status(Response.Status.NOT_FOUND).entity(msg).build();
+        } catch (ForbiddenException e) {
+            String msg = "You dont have permission to update application release review.";
+            log.error(msg, e);
+            return Response.status(Response.Status.FORBIDDEN).entity(msg).build();
+        } catch (ApplicationManagementException e) {
+            String msg = "Error occurred when getting application release data for application release UUID:." + uuid;
+            log.error(msg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();        }
     }
 
     @Override
@@ -147,9 +182,9 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
         ReviewManager reviewManager = APIUtil.getReviewManager();
         try {
             if (reviewManager.deleteReview(uuid, reviewId)) {
-                return Response.status(Response.Status.OK).entity("Review is deleted successfully.").build();
+                return Response.status(Response.Status.OK).entity("ReviewTmp is deleted successfully.").build();
             } else {
-                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("Review deleting is failed.")
+                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("ReviewTmp deleting is failed.")
                         .build();
             }
         } catch (ReviewManagementException e) {
@@ -173,7 +208,7 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
         try {
             rating = reviewManager.getRating(uuid);
         } catch (ReviewManagementException e) {
-            log.error("Review Management Exception occurs", e);
+            log.error("ReviewTmp Management Exception occurs", e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
         }
         return Response.status(Response.Status.OK).entity(rating).build();
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
index 5cd0418f1eb..c6b6b5f2a6b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
@@ -17,34 +17,34 @@
  */
 package org.wso2.carbon.device.application.mgt.store.api.services.util;
 
-import org.wso2.carbon.device.application.mgt.common.Review;
+import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 
 /**
- * Helper class for Review Management API test cases.
+ * Helper class for ReviewTmp Management API test cases.
  */
 
 public class CommentMgtTestHelper {
 
-    private static final String COMMENT_TEXT = "Dummy Review";
+    private static final String COMMENT_TEXT = "Dummy ReviewTmp";
     private static final String CREATED_BY = "TEST_CREATED_BY";
     private static final String MODIFIED_BY = "TEST_MODIFIED_BY";
     private static final int PARENT_ID = 123;
     private static final int COMMENT_ID = 1;
 
     /**
-     * Creates a Review with given text and given uuid.
-     * If the text is null, the COMMENT_TEXT will be used as the Dummy Review.
+     * Creates a ReviewTmp with given text and given uuid.
+     * If the text is null, the COMMENT_TEXT will be used as the Dummy ReviewTmp.
      *
-     * @param commentText : Text of the Review
-     * @return Review
+     * @param commentText : Text of the ReviewTmp
+     * @return ReviewTmp
      */
-    public static Review getDummyComment(String commentText, String uuid) {
-        Review review = new Review();
-        review.setId(COMMENT_ID);
-        review.setUsername(CREATED_BY);
-        review.setComment(commentText != null ? commentText : COMMENT_TEXT);
+    public static ReviewTmp getDummyComment(String commentText, String uuid) {
+        ReviewTmp reviewTmp = new ReviewTmp();
+        reviewTmp.setId(COMMENT_ID);
+        reviewTmp.setUsername(CREATED_BY);
+        reviewTmp.setComment(commentText != null ? commentText : COMMENT_TEXT);
 
-        return review;
+        return reviewTmp;
     }
 }
 
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
index 5450d3941dc..b060ec76526 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
@@ -55,7 +55,8 @@ CREATE TABLE IF NOT EXISTS AP_APP_REVIEW(
   ID INTEGER NOT NULL AUTO_INCREMENT,
   TENANT_ID INTEGER NOT NULL,
   COMMENT VARCHAR(250) NOT NULL,
-  REPLY_COMMENT VARCHAR(250) NULL,
+  ROOT_PARENT_ID INTEGER NOT NULL,
+  IMMEDIATE_PARENT_ID INTEGER NOT NULL,
   CREATED_AT TIMESTAMP NOT NULL,
   MODIFIED_AT TIMESTAMP NOT NULL,
   RATING INTEGER NULL,

From abee848e2b3b51e0d7d30d5a157b6cad9b1f5608 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Wed, 15 May 2019 16:58:45 +0530
Subject: [PATCH 05/13] render Lifecycle from new library

---
 .../react-app/package.json                    |   2 +
 .../components/apps/release/LifeCycleGraph.js | 123 +++++++++---------
 .../apps/release/nodes/CustomNode.css         |  21 +++
 .../apps/release/nodes/CustomNode.jsx         |  36 +++++
 .../apps/release/temp/LifeCycleGraph.js       |  98 ++++++++++++++
 5 files changed, 220 insertions(+), 60 deletions(-)
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
index 469943d5b72..bb4a3574055 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
@@ -13,9 +13,11 @@
     "acorn": "^6.1.1",
     "antd": "^3.15.0",
     "axios": "^0.18.0",
+    "d3": "^5.9.2",
     "dagre": "^0.8.4",
     "keymirror": "^0.1.1",
     "react": "^16.8.4",
+    "react-d3-graph": "^2.0.2",
     "react-dom": "^16.8.4",
     "react-highlight-words": "^0.16.0",
     "react-router": "latest",
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
index fc25a9b306b..fa7ae3de7ef 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
@@ -1,98 +1,101 @@
 import React from "react";
-import * as SRD from "storm-react-diagrams";
-import "storm-react-diagrams/dist/style.min.css";
-import "./LifeCycle.css";
-import {distributeElements} from "../../../js/utils/dagre-utils.ts";
+import {Graph} from 'react-d3-graph';
+
+
+// the graph configuration, you only need to pass down properties
+// that you want to override, otherwise default ones will be used
+const myConfig = {
+    nodeHighlightBehavior: true,
+    directed: true,
+    height: 400,
+    d3: {
+        alphaTarget: 0.05,
+        gravity: -200,
+        linkLength: 200,
+        linkStrength: 1
+    },
+    node: {
+        color: "#d3d3d3",
+        fontColor: "black",
+        fontSize: 12,
+        fontWeight: "normal",
+        highlightFontSize: 12,
+        highlightFontWeight: "bold",
+        highlightStrokeColor: "SAME",
+        highlightStrokeWidth: 1.5,
+        labelProperty: "id",
+        mouseCursor: "pointer",
+        opacity: 1,
+        strokeColor: "none",
+        strokeWidth: 1.5,
+        svg: "",
+        symbolType: "circle",
+    },
+    link: {
+        highlightColor: 'lightblue'
+    }
+};
 
-const inPortName = "IN";
-const outPortName = "OUT";
+const onClickNode = function(nodeId) {
+    window.alert(`Clicked node ${nodeId}`);
+};
 
 class LifeCycleGraph extends React.Component {
+
     render() {
+// graph payload (with minimalist structure)
 
         const lifecycle = this.props.lifecycle;
         const nodes = [];
         const links = [];
-
-        const engine = new SRD.DiagramEngine();
-        engine.installDefaultFactories();
-
-        const model = new SRD.DiagramModel();
         const nextStates = lifecycle[this.props.currentStatus].proceedingStates;
 
 
         Object.keys(lifecycle).forEach((stateName) => {
+            const state = lifecycle[stateName];
             let color = "rgb(83, 92, 104)";
             if (stateName === this.props.currentStatus) {
-                color = "rgb(192,255,0)";
+                color = "rgb(39, 174, 96)";
             } else if (nextStates.includes(stateName)) {
                 color = "rgb(0,192,255)";
             }
-            const node = createNode(stateName, color);
+            let node = {
+                id: stateName,
+                color: color
+            };
             nodes.push(node);
-            lifecycle[stateName].node = node;
-        });
 
-        Object.keys(lifecycle).forEach((stateName) => {
-            const state = lifecycle[stateName];
             //todo: remove checking property
             if (state.hasOwnProperty("proceedingStates")) {
 
                 state.proceedingStates.forEach((proceedingState) => {
-                    links.push(connectNodes(state.node, lifecycle[proceedingState].node));
+                    let link = {
+                        source: stateName,
+                        target: proceedingState
+                    };
+                    links.push(link);
                 });
             }
         });
 
-        nodes.forEach((node) => {
-            model.addNode(node);
-            // node.addListener({
-            //     selectionChanged: (node, isSelected) => {
-            //         console.log(isSelected);
-            //     }
-            // });
-        });
-        links.forEach((link) => {
-            model.addLink(link);
-        });
-
+        const data = {
+            nodes: nodes,
+            links: links
+        };
 
-        let distributedModel = getDistributedModel(engine, model);
-        engine.setDiagramModel(distributedModel);
 
         return (
-            <div style={{height: 500}}>
-                <SRD.DiagramWidget diagramEngine={engine} maxNumberPointsPerLink={10} smartRouting={true}/>
+            <div>
+                <Graph
+                    id="graph-id" // id is mandatory, if no id is defined rd3g will throw an error
+                    data={data}
+                    config={myConfig}
+                    onClickNode={onClickNode}
+                />
             </div>
         );
     }
 }
 
-function getDistributedModel(engine, model) {
-    const serialized = model.serializeDiagram();
-    const distributedSerializedDiagram = distributeElements(serialized);
-
-    //deserialize the model
-    let deSerializedModel = new SRD.DiagramModel();
-    deSerializedModel.deSerializeDiagram(distributedSerializedDiagram, engine);
-    return deSerializedModel;
-}
-
-function createNode(name, color) {
-    const node = new SRD.DefaultNodeModel(name, color);
-    node.addPort(new SRD.DefaultPortModel(true, inPortName, " "));
-    node.addPort(new SRD.DefaultPortModel(false, outPortName, " "));
-    return node;
-}
-
-let count = 0;
-
-function connectNodes(nodeFrom, nodeTo) {
-    return nodeFrom.getPort(outPortName).link(nodeTo.getPort(inPortName));
-}
-
-function f() {
-    console.log(1);
-}
 
 export default LifeCycleGraph;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css
new file mode 100644
index 00000000000..2b59de070cc
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.css
@@ -0,0 +1,21 @@
+
+/* --- Shape for the nodes --- */
+
+.node {
+    width: 75px;
+    height: 30px;
+    border-radius: 20% 20% 20% 20%;
+    overflow: hidden;
+    box-sizing: border-box;
+    display: flex;
+}
+
+
+.node .name {
+    padding: 5%;
+    font-size: 0.5rem;
+    font-weight: bold;
+    text-align: center;
+    text-transform: uppercase;
+    color: white;
+}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx
new file mode 100644
index 00000000000..a77025bdd15
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/nodes/CustomNode.jsx
@@ -0,0 +1,36 @@
+import React from "react";
+
+import "./CustomNode.css";
+
+
+/**
+ * Component that renders a person's name and gender, along with icons
+ * representing if they have a driver license for bike and / or car.
+ * @param {Object} props component props to render.
+ */
+function CustomNode({ node }) {
+
+    return (
+        <div className="node" style={{backgroundColor: node.color}}>
+            <div className="name">{node.id}</div>
+
+            {/*<div className="flex-container fill-space flex-container-row">*/}
+                {/*<div className="fill-space">*/}
+                    {/*<div*/}
+                        {/*className="icon"*/}
+                        {/*style={{ backgroundImage: `url('${isMale ? ICON_TYPES.MAN : ICON_TYPES.WOMAN}')` }}*/}
+                    {/*/>*/}
+                {/*</div>*/}
+
+                {/*<div className="icon-bar">*/}
+                    {/*{person.hasBike && (*/}
+                        {/*<div className="icon" style={{ backgroundImage: `url('${ICON_TYPES.BIKE}')` }} />*/}
+                    {/*)}*/}
+                    {/*{person.hasCar && <div className="icon" style={{ backgroundImage: `url('${ICON_TYPES.CAR}')` }} />}*/}
+                {/*</div>*/}
+            {/*</div>*/}
+        </div>
+    );
+}
+
+export default CustomNode;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js
new file mode 100644
index 00000000000..fc25a9b306b
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js
@@ -0,0 +1,98 @@
+import React from "react";
+import * as SRD from "storm-react-diagrams";
+import "storm-react-diagrams/dist/style.min.css";
+import "./LifeCycle.css";
+import {distributeElements} from "../../../js/utils/dagre-utils.ts";
+
+const inPortName = "IN";
+const outPortName = "OUT";
+
+class LifeCycleGraph extends React.Component {
+    render() {
+
+        const lifecycle = this.props.lifecycle;
+        const nodes = [];
+        const links = [];
+
+        const engine = new SRD.DiagramEngine();
+        engine.installDefaultFactories();
+
+        const model = new SRD.DiagramModel();
+        const nextStates = lifecycle[this.props.currentStatus].proceedingStates;
+
+
+        Object.keys(lifecycle).forEach((stateName) => {
+            let color = "rgb(83, 92, 104)";
+            if (stateName === this.props.currentStatus) {
+                color = "rgb(192,255,0)";
+            } else if (nextStates.includes(stateName)) {
+                color = "rgb(0,192,255)";
+            }
+            const node = createNode(stateName, color);
+            nodes.push(node);
+            lifecycle[stateName].node = node;
+        });
+
+        Object.keys(lifecycle).forEach((stateName) => {
+            const state = lifecycle[stateName];
+            //todo: remove checking property
+            if (state.hasOwnProperty("proceedingStates")) {
+
+                state.proceedingStates.forEach((proceedingState) => {
+                    links.push(connectNodes(state.node, lifecycle[proceedingState].node));
+                });
+            }
+        });
+
+        nodes.forEach((node) => {
+            model.addNode(node);
+            // node.addListener({
+            //     selectionChanged: (node, isSelected) => {
+            //         console.log(isSelected);
+            //     }
+            // });
+        });
+        links.forEach((link) => {
+            model.addLink(link);
+        });
+
+
+        let distributedModel = getDistributedModel(engine, model);
+        engine.setDiagramModel(distributedModel);
+
+        return (
+            <div style={{height: 500}}>
+                <SRD.DiagramWidget diagramEngine={engine} maxNumberPointsPerLink={10} smartRouting={true}/>
+            </div>
+        );
+    }
+}
+
+function getDistributedModel(engine, model) {
+    const serialized = model.serializeDiagram();
+    const distributedSerializedDiagram = distributeElements(serialized);
+
+    //deserialize the model
+    let deSerializedModel = new SRD.DiagramModel();
+    deSerializedModel.deSerializeDiagram(distributedSerializedDiagram, engine);
+    return deSerializedModel;
+}
+
+function createNode(name, color) {
+    const node = new SRD.DefaultNodeModel(name, color);
+    node.addPort(new SRD.DefaultPortModel(true, inPortName, " "));
+    node.addPort(new SRD.DefaultPortModel(false, outPortName, " "));
+    return node;
+}
+
+let count = 0;
+
+function connectNodes(nodeFrom, nodeTo) {
+    return nodeFrom.getPort(outPortName).link(nodeTo.getPort(inPortName));
+}
+
+function f() {
+    console.log(1);
+}
+
+export default LifeCycleGraph;
\ No newline at end of file

From a1b8632aa46597528af2f13301acbadd12581805 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Wed, 15 May 2019 17:18:17 +0530
Subject: [PATCH 06/13] Improve review management

---
 .../application/mgt/common/ReviewNode.java    |  67 ++++++++++
 .../application/mgt/core/dao/ReviewDAO.java   |   3 +
 .../ApplicationManagementDAOFactory.java      |   2 +-
 .../GenericApplicationDAOImpl.java            |  54 ++++----
 .../application/OracleApplicationDAOImpl.java |  14 --
 .../GenericApplicationReleaseDAOImpl.java     |  42 +++---
 .../GenericLifecycleStateDAOImpl.java         |  10 +-
 .../{Review => review}/ReviewDAOImpl.java     | 120 ++++++++++--------
 .../GenericSubscriptionDAOImpl.java           |  15 +--
 .../visibility/GenericVisibilityDAOImpl.java  |   8 +-
 .../mgt/core/impl/ApplicationManagerImpl.java |  22 ++--
 .../mgt/core/impl/AppmDataHandlerImpl.java    |   4 +-
 .../mgt/core/impl/ReviewManagerImpl.java      |  31 +++--
 .../core/util/ApplicationManagementUtil.java  |   2 +-
 .../application/mgt/core/util/Constants.java  |   2 +-
 .../common/Util.java => util/DAOUtil.java}    |  45 +++++--
 16 files changed, 271 insertions(+), 170 deletions(-)
 create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java
 rename components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/{Review => review}/ReviewDAOImpl.java (84%)
 rename components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/{dao/common/Util.java => util/DAOUtil.java} (90%)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java
new file mode 100644
index 00000000000..5a7f9930b7f
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ReviewNode.java
@@ -0,0 +1,67 @@
+package org.wso2.carbon.device.application.mgt.common;
+/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReviewNode<T> {
+
+    private T data = null;
+
+    private List<ReviewNode<T>> children = new ArrayList<>();
+
+    private ReviewNode<T> parent = null;
+
+    public ReviewNode(T data) {
+        this.data = data;
+    }
+
+    public ReviewNode<T> addChild(ReviewNode<T> child) {
+        child.setParent(this);
+        this.children.add(child);
+        return child;
+    }
+
+    public void addChildren(List<ReviewNode<T>> children) {
+        children.forEach(each -> each.setParent(this));
+        this.children.addAll(children);
+    }
+
+    public List<ReviewNode<T>> getChildren() {
+        return children;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    private void setParent(ReviewNode<T> parent) {
+        this.parent = parent;
+    }
+
+    public ReviewNode<T> getParent() {
+        return parent;
+    }
+
+}
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java
index 9f705d54c90..a77f0a28ef5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java
@@ -94,6 +94,9 @@ import java.util.List;
     List<ReviewDTO> getAllReviews(String uuid, PaginationRequest request, int tenantId)
             throws ReviewManagementDAOException;
 
+    List<ReviewDTO> getReplyComments(int parentId, PaginationRequest request, int tenantId)
+         throws ReviewManagementDAOException;
+
     /**
      * To get list of comments using release id and application id.
      * @param uuid UUID of the application release
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java
index 1aa44c03322..b800a4fd5ac 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/ApplicationManagementDAOFactory.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.application.mgt.common.exception.UnsupportedDatabaseEngineException;
 import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager;
 import org.wso2.carbon.device.application.mgt.core.dao.*;
-import org.wso2.carbon.device.application.mgt.core.dao.impl.Review.ReviewDAOImpl;
+import org.wso2.carbon.device.application.mgt.core.dao.impl.review.ReviewDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.application.release.GenericApplicationReleaseDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.application.OracleApplicationDAOImpl;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
index 0120cccf6b5..76dd1c08284 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
@@ -30,7 +30,7 @@ import org.wso2.carbon.device.application.mgt.common.Filter;
 import org.wso2.carbon.device.application.mgt.common.dto.TagDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException;
@@ -90,7 +90,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while adding the application", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -120,7 +120,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             throw new ApplicationManagementDAOException(
                     "DB connection error occured while checking whether application exist or not.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -248,7 +248,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             }
             stmt.setInt(paramIndex, filter.getOffset());
             rs = stmt.executeQuery();
-            return Util.loadApplications(rs);
+            return DAOUtil.loadApplications(rs);
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while getting application list for the tenant"
                     + " " + tenantId + ". While executing " + sql, e);
@@ -259,7 +259,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (JSONException e) {
             throw new ApplicationManagementDAOException("Error occurred while parsing JSON ", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -294,7 +294,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection for "
                                                                 + "getting app release id", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -338,7 +338,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
         return count;
     }
@@ -373,7 +373,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                                   + appType + "and app name " + appName);
             }
 
-            return Util.loadApplication(rs);
+            return DAOUtil.loadApplication(rs);
 
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException(
@@ -386,7 +386,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (UnexpectedServerErrorException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -416,7 +416,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                 log.debug("Successfully retrieved basic details of the application with the id:" + id);
             }
 
-            return Util.loadApplication(rs);
+            return DAOUtil.loadApplication(rs);
 
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException(
@@ -429,7 +429,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (UnexpectedServerErrorException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -490,7 +490,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                                   + releaseUuid);
             }
 
-            return Util.loadApplication(rs);
+            return DAOUtil.loadApplication(rs);
 
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException(
@@ -503,7 +503,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (UnexpectedServerErrorException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -562,7 +562,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                 log.debug("Successfully retrieved basic details of the application with the id "
                         + applicationId);
             }
-            return Util.loadApplication(rs);
+            return DAOUtil.loadApplication(rs);
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException(
                     "Error occurred while getting application details with app id " + applicationId +
@@ -574,7 +574,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (UnexpectedServerErrorException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -607,7 +607,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -662,7 +662,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while deleting the application: ", e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -693,7 +693,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while adding tags", e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -730,7 +730,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while adding tags", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -767,7 +767,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while getting categories", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -859,7 +859,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while adding categories.", e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -892,7 +892,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while adding data into category mapping.", e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -1101,7 +1101,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while adding tags", e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -1459,7 +1459,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             throw new ApplicationManagementDAOException(
                     "Error occurred while deleting tags of application: " + applicationId, e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -1497,7 +1497,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
 
             ApplicationDTO application = null;
             while (rs.next()) {
-                ApplicationReleaseDTO appRelease = Util.loadApplicationRelease(rs);
+                ApplicationReleaseDTO appRelease = DAOUtil.loadApplicationRelease(rs);
                 application = new ApplicationDTO();
 
                 application.setId(rs.getInt("APP_ID"));
@@ -1528,7 +1528,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -1557,7 +1557,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException("Error occurred while getting application List", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java
index 0e49ea4a061..56432d8db03 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java
@@ -21,20 +21,6 @@ package org.wso2.carbon.device.application.mgt.core.dao.impl.application;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.wso2.carbon.device.application.mgt.common.AppLifecycleState;
-import org.wso2.carbon.device.application.mgt.common.ApplicationList;
-import org.wso2.carbon.device.application.mgt.common.Filter;
-import org.wso2.carbon.device.application.mgt.common.Pagination;
-import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
-import org.wso2.carbon.device.application.mgt.core.dao.impl.application.GenericApplicationDAOImpl;
-import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 /**
  * This is a ApplicationDAO Implementation specific to Oracle.
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java
index 808d1603dfb..df590f2a13b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java
@@ -21,13 +21,11 @@ package org.wso2.carbon.device.application.mgt.core.dao.impl.application.release
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.AppLifecycleState;
 import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationReleaseArtifactPaths;
 import org.wso2.carbon.device.application.mgt.common.Rating;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 
@@ -118,7 +116,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             throw new ApplicationManagementDAOException(
                     "Database Connection Exception while trying to release a new version", e);
         } finally {
-            Util.cleanupResources(statement, resultSet);
+            DAOUtil.cleanupResources(statement, resultSet);
         }
     }
 
@@ -160,7 +158,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             resultSet = statement.executeQuery();
 
             if (resultSet.next()) {
-                return Util.loadApplicationRelease(resultSet);
+                return DAOUtil.loadApplicationRelease(resultSet);
             }
             return null;
         } catch (DBConnectionException e) {
@@ -170,7 +168,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             throw new ApplicationManagementDAOException(
                     "Error while getting release details of the application " + applicationName + " and version " + versionName + " , while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, resultSet);
+            DAOUtil.cleanupResources(statement, resultSet);
         }
     }
 
@@ -207,7 +205,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             resultSet = statement.executeQuery();
 
             if (resultSet.next()) {
-                return Util.loadApplicationRelease(resultSet);
+                return DAOUtil.loadApplicationRelease(resultSet);
             }
             return null;
         } catch (DBConnectionException e) {
@@ -219,7 +217,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
                     "Error while getting release details of the application id: " + applicationId
                             + " and theUUID of the application " + "release: " + releaseUuid + " , while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, resultSet);
+            DAOUtil.cleanupResources(statement, resultSet);
         }
     }
 
@@ -255,7 +253,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
                 statement.setInt(2, tenantId);
                 try (ResultSet resultSet = statement.executeQuery()) {
                     if (resultSet.next()) {
-                        return Util.loadAppRelease(resultSet);
+                        return DAOUtil.loadAppRelease(resultSet);
                     }
                     return null;
                 }
@@ -299,7 +297,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             resultSet = statement.executeQuery();
 
             while (resultSet.next()) {
-                ApplicationReleaseDTO applicationRelease = Util.loadApplicationRelease(resultSet);
+                ApplicationReleaseDTO applicationRelease = DAOUtil.loadApplicationRelease(resultSet);
                 applicationReleases.add(applicationRelease);
             }
             return applicationReleases;
@@ -311,7 +309,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
                     "Error while getting all the release details of the app ID: " + applicationId
                             + ", while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, resultSet);
+            DAOUtil.cleanupResources(statement, resultSet);
         }
     }
 
@@ -342,7 +340,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             resultSet = statement.executeQuery();
 
             while (resultSet.next()) {
-                ApplicationReleaseDTO appRelease = Util.loadApplicationRelease(resultSet);
+                ApplicationReleaseDTO appRelease = DAOUtil.loadApplicationRelease(resultSet);
                 applicationReleases.add(appRelease);
             }
             return applicationReleases;
@@ -354,7 +352,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
                     "Error while getting all the release details of the app id" + appId + " application"
                             + ", while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, resultSet);
+            DAOUtil.cleanupResources(statement, resultSet);
         }
     }
 
@@ -384,7 +382,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             throw new ApplicationManagementDAOException(
                     "SQL exception while updating the release rating value ,while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, null);
+            DAOUtil.cleanupResources(statement, null);
         }
     }
 
@@ -420,7 +418,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             throw new ApplicationManagementDAOException(
                     "SQL exception while updating the release ,while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, resultSet);
+            DAOUtil.cleanupResources(statement, resultSet);
         }
     }
 
@@ -487,7 +485,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             throw new ApplicationManagementDAOException(
                     "SQL exception while updating the release ,while executing the query " + sql, e);
         } finally {
-            Util.cleanupResources(statement, null);
+            DAOUtil.cleanupResources(statement, null);
         }
         return applicationReleaseDTO;
     }
@@ -512,7 +510,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
                     "SQL exception while deleting the release for release ID: " + id  + ",while executing the query sql"
                     , e);
         } finally {
-            Util.cleanupResources(statement, null);
+            DAOUtil.cleanupResources(statement, null);
         }
     }
 
@@ -566,7 +564,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -603,7 +601,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             throw new ApplicationManagementDAOException(
                     "Error occurred while obtaining the DB connection to get application release package name.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -640,7 +638,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -674,7 +672,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -721,7 +719,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java
index 73b1951b06f..0673e1cb315 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/lifecyclestate/GenericLifecycleStateDAOImpl.java
@@ -24,7 +24,7 @@ import org.wso2.carbon.device.application.mgt.common.AppLifecycleState;
 import org.wso2.carbon.device.application.mgt.common.LifecycleState;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.LifecycleStateDAO;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.exception.LifeCycleManagementDAOException;
 
@@ -64,7 +64,7 @@ public class GenericLifecycleStateDAOImpl extends AbstractDAOImpl implements Lif
             throw new LifeCycleManagementDAOException("Error occurred while obtaining the DB connection to get latest"
                     + " lifecycle state for a specific application", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -89,7 +89,7 @@ public class GenericLifecycleStateDAOImpl extends AbstractDAOImpl implements Lif
             throw new LifeCycleManagementDAOException("Error occurred while obtaining the DB connection to get latest"
                     + " lifecycle state for a specific application", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -120,7 +120,7 @@ public class GenericLifecycleStateDAOImpl extends AbstractDAOImpl implements Lif
             throw new LifeCycleManagementDAOException("Error occurred while obtaining the DB connection to get latest"
                     + " lifecycle state for a specific application", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -199,7 +199,7 @@ public class GenericLifecycleStateDAOImpl extends AbstractDAOImpl implements Lif
             log.error("Error occurred while adding lifecycle: " + state.getCurrentState(), e);
             throw new LifeCycleManagementDAOException("Error occurred while adding lifecycle: " + state.getCurrentState(), e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/ReviewDAOImpl.java
similarity index 84%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java
rename to components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/ReviewDAOImpl.java
index e4aa49099d9..4581c6ee1b7 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/Review/ReviewDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/ReviewDAOImpl.java
@@ -16,20 +16,21 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.application.mgt.core.dao.impl.Review;
+package org.wso2.carbon.device.application.mgt.core.dao.impl.review;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.ReviewDAO;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.exception.ReviewManagementDAOException;
+import org.wso2.carbon.device.application.mgt.core.util.Constants;
 
 import java.sql.SQLException;
 import java.sql.ResultSet;
@@ -165,7 +166,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
         } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException("Error occured while getting the db connection to update reviewTmp");
         } finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
     }
 
@@ -194,27 +195,17 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
             statement = conn.prepareStatement(sql);
             statement.setInt(1, reviewId);
             rs = statement.executeQuery();
-            if (rs.next()) {
-                ReviewDTO reviewDTO = new ReviewDTO();
-                reviewDTO.setId(rs.getInt("ID"));
-                reviewDTO.setContent(rs.getString("COMMENT"));
-                reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
-                reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
-                reviewDTO.setRating(rs.getInt("RATING"));
-                reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
-                reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
-                reviewDTO.setUsername(rs.getString("USERNAME"));
-                return reviewDTO;
-            }
-            return null;
+            return DAOUtil.loadReview(rs);
         } catch (SQLException e) {
             throw new ReviewManagementDAOException(
                     "SQL Error occurred while retrieving information of the reviewTmp " + reviewId, e);
         } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException(
                     "DB Connection Exception occurred while retrieving information of the reviewTmp " + reviewId, e);
+        } catch (UnexpectedServerErrorException e) {
+            throw new ReviewManagementDAOException("Found more than one review for review ID: " + reviewId, e);
         } finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
     }
 
@@ -244,27 +235,17 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
             statement.setInt(1, reviewId);
             statement.setInt(2, appReleaseId);
             rs = statement.executeQuery();
-            if (rs.next()) {
-                ReviewDTO reviewDTO = new ReviewDTO();
-                reviewDTO.setId(rs.getInt("ID"));
-                reviewDTO.setContent(rs.getString("COMMENT"));
-                reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
-                reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
-                reviewDTO.setRating(rs.getInt("RATING"));
-                reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
-                reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
-                reviewDTO.setUsername(rs.getString("USERNAME"));
-                return reviewDTO;
-            }
-            return null;
+            return DAOUtil.loadReview(rs);
         } catch (SQLException e) {
             throw new ReviewManagementDAOException(
                     "SQL Error occurred while retrieving information of the reviewTmp " + reviewId, e);
         } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException(
                     "DB Connection Exception occurred while retrieving information of the reviewTmp " + reviewId, e);
+        } catch (UnexpectedServerErrorException e) {
+            throw new ReviewManagementDAOException("Found more than one review for review ID: " + reviewId, e);
         } finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
     }
 
@@ -277,8 +258,6 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
             log.debug("Getting comment of the application release (" + uuid + ") from the database");
         }
         Connection conn;
-        PreparedStatement statement = null;
-        ResultSet rs = null;
         List<ReviewDTO> reviewDTOs = new ArrayList<>();
         try {
             conn = this.getDBConnection();
@@ -297,32 +276,67 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
                     + "AP_APP_RELEASE.UUID = ? AND "
                     + "AP_APP_REVIEW.TENANT_ID = ? AND "
                     + "AP_APP_REVIEW.TENANT_ID = AP_APP_RELEASE.TENANT_ID "
+                    + "LIMIT ? OFFSET ?";
+            try (PreparedStatement statement = conn.prepareStatement(sql)) {
+                statement.setString(1, uuid);
+                statement.setInt(2, tenantId);
+                statement.setInt(3, request.getLimit());
+                statement.setInt(4, request.getOffSet());
+                try (ResultSet rs = statement.executeQuery()) {
+                    reviewDTOs = DAOUtil.loadReviews(rs);
+                }
+            }
+        } catch (DBConnectionException e) {
+            throw new ReviewManagementDAOException(
+                    "Error occurred while obtaining the DB connection when verifying application existence", e);
+        } catch (SQLException e) {
+            throw new ReviewManagementDAOException("DB connection error occurred while getting all reviewTmps", e);
+        } return reviewDTOs;
+    }
+
+    @Override
+    public List<ReviewDTO> getReplyComments(int parentId, PaginationRequest request, int tenantId)
+            throws ReviewManagementDAOException {
+
+        if (log.isDebugEnabled()) {
+            log.debug("Getting comment of the application release (" + parentId + ") from the database");
+        }
+        Connection conn;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        List<ReviewDTO> reviewDTOs = new ArrayList<>();
+        try {
+            conn = this.getDBConnection();
+            sql = "SELECT "
+                    + "AP_APP_REVIEW.ID AS ID, "
+                    + "AP_APP_REVIEW.COMMENT AS COMMENT, "
+                    + "AP_APP_REVIEW.CREATED_AT AS CREATED_AT, "
+                    + "AP_APP_REVIEW.MODIFIED_AT AS MODIFIED_AT, "
+                    + "AP_APP_REVIEW.USERNAME AS USERNAME, "
+                    + "AP_APP_REVIEW.PARENT_ID AS ROOT_PARENT_ID, "
+                    + "AP_APP_REVIEW.REVIEW_TYPE AS IMMEDIATE_PARENT_ID, "
+                    + "AP_APP_REVIEW.RATING AS RATING "
+                    + "FROM AP_APP_REVIEW, AP_APP_RELEASE "
+                    + "WHERE "
+                    + "AP_APP_REVIEW.AP_APP_RELEASE_ID=AP_APP_RELEASE.ID AND "
+                    + "AP_APP_RELEASE.PARENT_ID = ? AND "
+                    + "AP_APP_REVIEW.TENANT_ID = ? AND "
+                    + "AP_APP_REVIEW.AP_APP_RELEASE_ID = AP_APP_RELEASE.ID "
                     + "LIMIT ? OFFSET ?;";
             statement = conn.prepareStatement(sql);
-            statement.setString(1, uuid);
+            statement.setInt(1, parentId);
             statement.setInt(2, tenantId);
             statement.setInt(3, request.getLimit());
             statement.setInt(4, request.getOffSet());
             rs = statement.executeQuery();
-            while (rs.next()) {
-                ReviewDTO reviewDTO = new ReviewDTO();
-                reviewDTO.setId(rs.getInt("ID"));
-                reviewDTO.setContent(rs.getString("COMMENT"));
-                reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
-                reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
-                reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
-                reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
-                reviewDTO.setUsername(rs.getString("USERNAME"));
-                reviewDTO.setRating(rs.getInt("RATING"));
-                reviewDTOs.add(reviewDTO);
-            }
+            reviewDTOs = DAOUtil.loadReviews(rs);
         }  catch (DBConnectionException e) {
             throw new ReviewManagementDAOException(
                     "Error occurred while obtaining the DB connection when verifying application existence", e);
         } catch (SQLException e) {
             throw new ReviewManagementDAOException("DB connection error occurred while getting all reviewTmps", e);
         }finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
         return reviewDTOs;
     }
@@ -358,7 +372,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
                     "Error occured while getting DB connection to retrieve all rating values for the application release. App release UUID: "
                             + uuid, e);
         } finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
         return reviews;
     }
@@ -392,7 +406,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
         } catch (DBConnectionException e) {
             throw new ReviewManagementDAOException("DB Connection Exception occurred while retrieving review counts", e);
         } finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
         return commentCount;
     }
@@ -421,7 +435,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
                 commentCount = rs.getInt("COMMENT_COUNT");
             }
         } finally {
-            Util.cleanupResources(statement, rs);
+            DAOUtil.cleanupResources(statement, rs);
         }
         return commentCount;
     }
@@ -443,7 +457,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
             throw new ReviewManagementDAOException("Error occured while getting the database connection", e);
 
         } finally {
-            Util.cleanupResources(statement, null);
+            DAOUtil.cleanupResources(statement, null);
         }
     }
 
@@ -471,7 +485,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
         } catch (SQLException e) {
             throw new ReviewManagementException("SQL Error occurred while deleting comments", e);
         } finally {
-            Util.cleanupResources(statement, null);
+            DAOUtil.cleanupResources(statement, null);
         }
     }
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java
index 7eeb71046c6..b59ca1f7b23 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java
@@ -19,15 +19,12 @@ package org.wso2.carbon.device.application.mgt.core.dao.impl.subscription;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO;
 import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
-import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 
@@ -70,7 +67,7 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
             throw new ApplicationManagementDAOException("Error occurred while adding device application mapping to DB",
                     e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -104,7 +101,7 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
             throw new ApplicationManagementDAOException("Error occurred while adding device application mapping to DB",
                     e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -137,7 +134,7 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
             throw new ApplicationManagementDAOException("Error occurred while adding device application mapping to DB",
                     e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -170,7 +167,7 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
             throw new ApplicationManagementDAOException("Error occurred while adding device application mapping to DB",
                     e);
         } finally {
-            Util.cleanupResources(stmt, null);
+            DAOUtil.cleanupResources(stmt, null);
         }
     }
 
@@ -203,7 +200,7 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
                         log.debug("Successfully retrieved device subscriptions for application release id "
                                 + appReleaseId);
                     }
-                    return Util.loadDeviceSubscriptions(rs);
+                    return DAOUtil.loadDeviceSubscriptions(rs);
                 }
             }
         } catch (SQLException e) {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java
index 26f88165b05..c37949dbf3c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/visibility/GenericVisibilityDAOImpl.java
@@ -21,7 +21,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.core.dao.VisibilityDAO;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.dao.impl.AbstractDAOImpl;
 import org.wso2.carbon.device.application.mgt.core.exception.VisibilityManagementDAOException;
 
@@ -66,7 +66,7 @@ public class GenericVisibilityDAOImpl extends AbstractDAOImpl implements Visibil
         }catch (SQLException e) {
             throw new VisibilityManagementDAOException("Error occurred while adding unrestricted roles", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -100,7 +100,7 @@ public class GenericVisibilityDAOImpl extends AbstractDAOImpl implements Visibil
         }catch (SQLException e) {
             throw new VisibilityManagementDAOException("Error occurred while adding unrestricted roles", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 
@@ -167,7 +167,7 @@ public class GenericVisibilityDAOImpl extends AbstractDAOImpl implements Visibil
         }catch (SQLException e) {
             throw new VisibilityManagementDAOException("Error occurred while adding unrestricted roles", e);
         } finally {
-            Util.cleanupResources(stmt, rs);
+            DAOUtil.cleanupResources(stmt, rs);
         }
     }
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
index c29040d809c..fc8f1ce530a 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
@@ -65,7 +65,7 @@ import org.wso2.carbon.device.application.mgt.core.dao.LifecycleStateDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.VisibilityDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
 import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException;
@@ -251,7 +251,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
         }
 
         //insert application data into databse
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
         ApplicationReleaseDTO applicationReleaseDTO = applicationDTO.getApplicationReleaseDTOs().get(0);
         try {
             List<ApplicationReleaseDTO> applicationReleaseEntities = new ArrayList<>();
@@ -379,7 +379,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
     }
 
     private void deleteApplicationArtifacts(List<String> directoryPaths) throws ApplicationManagementException {
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
 
         try {
             applicationStorageManager.deleteAllApplicationReleaseArtifacts(directoryPaths);
@@ -395,7 +395,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             ApplicationReleaseDTO applicationReleaseDTO, ApplicationArtifact applicationArtifact, boolean isNewRelease)
             throws ResourceManagementException, ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
 
         String uuid = UUID.randomUUID().toString();
         applicationReleaseDTO.setUuid(uuid);
@@ -478,7 +478,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             ApplicationReleaseDTO applicationReleaseDTO, ApplicationArtifact applicationArtifact)
             throws ResourceManagementException, ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
 
         // The application executable artifacts such as apks are uploaded.
         if (ApplicationType.ENTERPRISE.toString().equals(applicationType)) {
@@ -562,7 +562,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
 
     private ApplicationReleaseDTO addImageArtifacts(ApplicationReleaseDTO applicationReleaseDTO,
             ApplicationArtifact applicationArtifact) throws ResourceManagementException {
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
 
         applicationReleaseDTO.setIconName(applicationArtifact.getIconName());
         applicationReleaseDTO.setBannerName(applicationArtifact.getBannerName());
@@ -591,7 +591,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
 
     private ApplicationReleaseDTO updateImageArtifacts(ApplicationReleaseDTO applicationReleaseDTO,
             ApplicationArtifact applicationArtifact) throws ResourceManagementException{
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
 
         applicationStorageManager.deleteImageArtifacts(applicationReleaseDTO);
 
@@ -1193,7 +1193,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
                     + applicationId);
         }
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
         ApplicationDTO applicationDTO = getApplication(applicationId);
         List<ApplicationReleaseDTO> applicationReleaseDTOs = applicationDTO.getApplicationReleaseDTOs();
         for (ApplicationReleaseDTO applicationReleaseDTO : applicationReleaseDTOs) {
@@ -1334,7 +1334,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
     public void deleteApplicationRelease(String releaseUuid)
             throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
         try {
             ConnectionManagerUtil.beginDBTransaction();
             ApplicationReleaseDTO applicationReleaseDTO = this.applicationReleaseDAO
@@ -1477,7 +1477,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
         boolean isValidDeviceType = false;
         List<DeviceType> deviceTypes;
         try {
-            deviceTypes = Util.getDeviceManagementService().getDeviceTypes();
+            deviceTypes = DAOUtil.getDeviceManagementService().getDeviceTypes();
 
             for (DeviceType dt : deviceTypes) {
                 if (dt.getName().equals(deviceType)) {
@@ -2595,7 +2595,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             throws BadRequestException, UnexpectedServerErrorException {
         List<DeviceType> deviceTypes;
         try {
-            deviceTypes = Util.getDeviceManagementService().getDeviceTypes();
+            deviceTypes = DAOUtil.getDeviceManagementService().getDeviceTypes();
 
             if(deviceTypeAttr instanceof String){
                 for (DeviceType dt : deviceTypes) {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java
index 71570221afb..9f0ac6c8d23 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java
@@ -29,7 +29,7 @@ import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler;
 import org.wso2.carbon.device.application.mgt.common.config.UIConfiguration;
 import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
-import org.wso2.carbon.device.application.mgt.core.dao.common.Util;
+import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
 import org.wso2.carbon.device.application.mgt.core.internal.DataHolder;
@@ -67,7 +67,7 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
     @Override
     public InputStream getArtifactStream(String uuid, String artifactName) throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
+        ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
         ApplicationReleaseDAO applicationReleaseDAO = ApplicationManagementDAOFactory.getApplicationReleaseDAO();
         String artifactPath;
         String appReleaseHashValue;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
index b3b4047d81b..73fca86a403 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
@@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.application.mgt.common.Rating;
+import org.wso2.carbon.device.application.mgt.common.ReviewNode;
 import org.wso2.carbon.device.application.mgt.common.ReviewTmp;
 import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.application.mgt.common.PaginationResult;
@@ -283,7 +284,7 @@ public class ReviewManagerImpl implements ReviewManager {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         PaginationResult paginationResult = new PaginationResult();
         int numOfComments;
-        TreeMap<Integer, Review> reviewTree = new TreeMap<>();
+        TreeMap<Integer, ReviewNode<Review>> reviewTree = new TreeMap<>();
         if (log.isDebugEnabled()) {
             log.debug("Get all reviewTmps of the application release uuid: " + uuid);
         }
@@ -295,17 +296,13 @@ public class ReviewManagerImpl implements ReviewManager {
 
             for (Review review : reviews) {
                 if (review.getRootParentId() == -1 && review.getImmediateParentId() == -1) {
-                    reviewTree.put(review.getId(), review);
-                } else if (reviewTree.containsKey(review.getRootParentId())) {
-                    if (review.getRootParentId() == review.getImmediateParentId()) {
-                        reviewTree.get(review.getRootParentId()).getReplyComments().put(review.getId(), review);
-                    } else if (reviewTree.get(review.getRootParentId()).getReplyComments()
-                            .containsKey(review.getImmediateParentId())) {
-                        reviewTree.get(review.getRootParentId()).getReplyComments().get(review.getImmediateParentId())
-                                .getReplyComments().put(review.getId(), review);
-                    } else {
-                        //todo traverse and find
-                    }
+                    ReviewNode<Review> rootNode = new ReviewNode<>(review);
+                    reviewTree.put(review.getId(), rootNode);
+                } else if (reviewTree.containsKey(review.getImmediateParentId())) {
+                    ReviewNode<Review> childNode = new ReviewNode<>(review);
+                    reviewTree.get(review.getImmediateParentId()).addChild(childNode);
+                } else {
+                    reviewTree.put(review.getId(), findAndSetChild(reviewTree.get(review.getRootParentId()), review));
                 }
             }
             numOfComments = reviewTree.size();
@@ -329,6 +326,16 @@ public class ReviewManagerImpl implements ReviewManager {
         }
     }
 
+    private ReviewNode<Review> findAndSetChild(ReviewNode<Review> node, Review review) {
+        for (ReviewNode<Review> each : node.getChildren()) {
+            if ((each.getData()).getId() == review.getImmediateParentId()) {
+                ReviewNode<Review> childNode = new ReviewNode<>(review);
+                each.addChild(childNode);
+            }
+        }
+        return node;
+    }
+
     @Override
     public boolean deleteReview(String uuid, int reviewId)
             throws ReviewManagementException, ReviewDoesNotExistException {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java
index 3d3da35b870..30751baa962 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java
@@ -32,7 +32,7 @@ import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManag
 import java.lang.reflect.Constructor;
 
 /**
- * This Util class is responsible for making sure single instance of each Extension Manager is used throughout for
+ * This DAOUtil class is responsible for making sure single instance of each Extension Manager is used throughout for
  * all the tasks.
  */
 public class ApplicationManagementUtil {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java
index 1b9695659f7..4c705094a51 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java
@@ -64,5 +64,5 @@ public class Constants {
      */
     public static final String RELEASE_ARTIFACT = "artifact";
 
-    public static final int MAXIMUM_REVIEWS_PER_USER = 10;
+    public static final int REVIEW_PARENT_ID = -1;
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java
similarity index 90%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java
rename to components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java
index 6a98cd17805..5285ef11f6d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.application.mgt.core.dao.common;
+package org.wso2.carbon.device.application.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,6 +27,7 @@ import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
 
 import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO;
 import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO;
+import org.wso2.carbon.device.application.mgt.common.dto.ReviewDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
 import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager;
 import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager;
@@ -34,8 +35,6 @@ import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManage
 import org.wso2.carbon.device.application.mgt.core.config.Configuration;
 import org.wso2.carbon.device.application.mgt.core.config.ConfigurationManager;
 import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl;
-import org.wso2.carbon.device.application.mgt.core.util.ApplicationManagementUtil;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
 
@@ -48,9 +47,9 @@ import java.util.List;
 /**
  * This class is responsible for handling the utils of the Application Management DAO.
  */
-public class Util {
+public class DAOUtil {
 
-    private static final Log log = LogFactory.getLog(Util.class);
+    private static final Log log = LogFactory.getLog(DAOUtil.class);
 
     /**
      * To create application object from the result set retrieved from the Database.
@@ -204,6 +203,36 @@ public class Util {
         return applicationRelease;
     }
 
+    public static ReviewDTO loadReview(ResultSet rs) throws SQLException, UnexpectedServerErrorException {
+        List<ReviewDTO> reviewDTOs = loadReviews(rs);
+        if (reviewDTOs.isEmpty()) {
+            return null;
+        }
+        if (reviewDTOs.size() > 1) {
+            String msg = "Internal server error. Found more than one review for requested review ID";
+            log.error(msg);
+            throw new UnexpectedServerErrorException(msg);
+        }
+        return reviewDTOs.get(0);
+    }
+
+    public static List<ReviewDTO> loadReviews (ResultSet rs) throws SQLException {
+        List<ReviewDTO> reviewDTOs = new ArrayList<>();
+        while (rs.next()) {
+            ReviewDTO reviewDTO = new ReviewDTO();
+            reviewDTO.setId(rs.getInt("ID"));
+            reviewDTO.setContent(rs.getString("COMMENT"));
+            reviewDTO.setCreatedAt(rs.getTimestamp("CREATED_AT"));
+            reviewDTO.setModifiedAt(rs.getTimestamp("MODIFIED_AT"));
+            reviewDTO.setRootParentId(rs.getInt("ROOT_PARENT_ID"));
+            reviewDTO.setImmediateParentId(rs.getInt("IMMEDIATE_PARENT_ID"));
+            reviewDTO.setUsername(rs.getString("USERNAME"));
+            reviewDTO.setRating(rs.getInt("RATING"));
+            reviewDTOs.add(reviewDTO);
+        }
+        return reviewDTOs;
+    }
+
     /**
      * Cleans up the statement and resultset after executing the query
      *
@@ -248,7 +277,7 @@ public class Util {
 
     public static ApplicationManager getApplicationManager() {
         if (applicationManager == null) {
-            synchronized (Util.class) {
+            synchronized (DAOUtil.class) {
                 if (applicationManager == null) {
                     PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
                     applicationManager =
@@ -272,7 +301,7 @@ public class Util {
 
         try {
             if (applicationStorageManager == null) {
-                synchronized (Util.class) {
+                synchronized (DAOUtil.class) {
                     if (applicationStorageManager == null) {
                         applicationStorageManager = ApplicationManagementUtil
                                 .getApplicationStorageManagerInstance();
@@ -299,7 +328,7 @@ public class Util {
      */
     public static SubscriptionManager getSubscriptionManager() {
         if (subscriptionManager == null) {
-            synchronized (Util.class) {
+            synchronized (DAOUtil.class) {
                 if (subscriptionManager == null) {
                     PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
                     subscriptionManager =

From 03ae30423425c5f6162c54ccc9da9852ebc706d4 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Thu, 16 May 2019 03:56:45 +0530
Subject: [PATCH 07/13] Fix lifecycle changing issue

---
 .../core/dao/impl/application/GenericApplicationDAOImpl.java   | 3 +++
 .../application/release/GenericApplicationReleaseDAOImpl.java  | 1 +
 .../wso2/carbon/device/application/mgt/core/util/DAOUtil.java  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
index 76dd1c08284..59ef55e1b47 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
@@ -158,6 +158,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                 + "AP_APP_RELEASE.APP_HASH_VALUE AS RELEASE_HASH_VALUE, "
                 + "AP_APP_RELEASE.APP_PRICE AS RELEASE_PRICE, "
                 + "AP_APP_RELEASE.APP_META_INFO AS RELEASE_META_INFO, "
+                + "AP_APP_RELEASE.PACKAGE_NAME AS PACKAGE_NAME, "
                 + "AP_APP_RELEASE.SUPPORTED_OS_VERSIONS AS RELEASE_SUP_OS_VERSIONS, "
                 + "AP_APP_RELEASE.RATING AS RELEASE_RATING, "
                 + "AP_APP_RELEASE.CURRENT_STATE AS RELEASE_CURRENT_STATE, "
@@ -468,6 +469,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                     + "AP_APP_RELEASE.APP_HASH_VALUE AS RELEASE_HASH_VALUE, "
                     + "AP_APP_RELEASE.APP_PRICE AS RELEASE_PRICE, "
                     + "AP_APP_RELEASE.APP_META_INFO AS RELEASE_META_INFO, "
+                    + "AP_APP_RELEASE.PACKAGE_NAME AS PACKAGE_NAME, "
                     + "AP_APP_RELEASE.SUPPORTED_OS_VERSIONS AS RELEASE_SUP_OS_VERSIONS, "
                     + "AP_APP_RELEASE.RATING AS RELEASE_RATING, "
                     + "AP_APP_RELEASE.CURRENT_STATE AS RELEASE_CURRENT_STATE, "
@@ -542,6 +544,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                     + "AP_APP_RELEASE.APP_HASH_VALUE AS RELEASE_HASH_VALUE, "
                     + "AP_APP_RELEASE.APP_PRICE AS RELEASE_PRICE, "
                     + "AP_APP_RELEASE.APP_META_INFO AS RELEASE_META_INFO, "
+                    + "AP_APP_RELEASE.PACKAGE_NAME AS PACKAGE_NAME, "
                     + "AP_APP_RELEASE.SUPPORTED_OS_VERSIONS AS RELEASE_SUP_OS_VERSIONS, "
                     + "AP_APP_RELEASE.RATING AS RELEASE_RATING, "
                     + "AP_APP_RELEASE.CURRENT_STATE AS RELEASE_CURRENT_STATE, "
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java
index df590f2a13b..93663008c81 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/release/GenericApplicationReleaseDAOImpl.java
@@ -239,6 +239,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
                         + "AR.APP_HASH_VALUE AS RELEASE_HASH_VALUE, "
                         + "AR.APP_PRICE AS RELEASE_PRICE, "
                         + "AR.APP_META_INFO AS RELEASE_META_INFO, "
+                        + "AR.PACKAGE_NAME AS PACKAGE_NAME, "
                         + "AR.SUPPORTED_OS_VERSIONS AS RELEASE_SUP_OS_VERSIONS, "
                         + "AR.RATING AS RELEASE_RATING, "
                         + "AR.CURRENT_STATE AS RELEASE_CURRENT_STATE, "
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java
index 5285ef11f6d..57db28ef403 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/DAOUtil.java
@@ -145,6 +145,7 @@ public class DAOUtil {
         appRelease.setAppHashValue(rs.getString("RELEASE_HASH_VALUE"));
         appRelease.setPrice(rs.getDouble("RELEASE_PRICE"));
         appRelease.setMetaData(rs.getString("RELEASE_META_INFO"));
+        appRelease.setPackageName(rs.getString("PACKAGE_NAME"));
         appRelease.setSupportedOsVersions(rs.getString("RELEASE_SUP_OS_VERSIONS"));
         appRelease.setRating(rs.getDouble("RELEASE_RATING"));
         appRelease.setCurrentState(rs.getString("RELEASE_CURRENT_STATE"));

From 5ea379dfd06d9069617d434b4ca90f665ff4e29a Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Thu, 16 May 2019 11:57:25 +0530
Subject: [PATCH 08/13] Improve review management and lifecycle management in
 APPM

---
 .../mgt/common/response/Review.java           | 12 +--
 .../common/services/ApplicationManager.java   |  3 +-
 .../mgt/core/impl/ApplicationManagerImpl.java |  3 +-
 .../mgt/core/impl/ReviewManagerImpl.java      | 83 ++++++++++++-------
 ...ApplicationManagementPublisherAPIImpl.java |  5 +-
 .../impl/ReviewManagementAPIImpl.java         |  2 +-
 6 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java
index 55140969cbd..4acfa1e6a6e 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java
@@ -18,7 +18,7 @@
 package org.wso2.carbon.device.application.mgt.common.response;
 
 import java.sql.Timestamp;
-import java.util.TreeMap;
+import java.util.List;
 
 public class Review {
 
@@ -30,7 +30,7 @@ public class Review {
     private Timestamp createdAt;
     private Timestamp modifiedAt;
     private int rating;
-    private TreeMap<Integer, Review> replyComments;
+    private List<Review> replies;
 
     public int getId() {
         return id;
@@ -96,11 +96,7 @@ public class Review {
         this.rating = rating;
     }
 
-    public TreeMap<Integer, Review> getReplyComments() {
-        return replyComments;
-    }
+    public List<Review> getReplies() { return replies; }
 
-    public void setReplyComments(TreeMap<Integer, Review> replyComments) {
-        this.replyComments = replyComments;
-    }
+    public void setReplies(List<Review> replies) { this.replies = replies; }
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java
index 9b9874062ed..cf49bf2a326 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java
@@ -150,8 +150,9 @@ public interface ApplicationManager {
      * @param releaseUuid UUID of the ApplicationDTO Release.
      * @param lifecycleChanger Lifecycle changer that contains the action and the reson for the change.
      * @throws ApplicationManagementException ApplicationDTO Management Exception.
+     * @return
      */
-    void changeLifecycleState(String releaseUuid, LifecycleChanger lifecycleChanger)
+    ApplicationRelease changeLifecycleState(String releaseUuid, LifecycleChanger lifecycleChanger)
             throws ApplicationManagementException;
 
     /**
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
index fc8f1ce530a..04a63b485f5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java
@@ -1618,7 +1618,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
     }
 
     @Override
-    public void changeLifecycleState(String releaseUuid, LifecycleChanger lifecycleChanger)
+    public ApplicationRelease changeLifecycleState(String releaseUuid, LifecycleChanger lifecycleChanger)
             throws ApplicationManagementException {
 
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
@@ -1664,6 +1664,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
                 }
                 this.lifecycleStateDAO.addLifecycleState(lifecycleState, applicationReleaseDTO.getId(), tenantId);
                 ConnectionManagerUtil.commitDBTransaction();
+                return releaseDtoToRelease(applicationReleaseDTO);
             } else {
                 String msg = "Invalid lifecycle state transition from '" + applicationReleaseDTO.getCurrentState() + "'"
                         + " to '" + lifecycleChanger.getAction() + "'";
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
index 73fca86a403..b1f3ac8dcb5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java
@@ -172,8 +172,12 @@ public class ReviewManagerImpl implements ReviewManager {
             }
             ReviewDTO replyComment = reviewWrapperToDO(reviewWrapper);
             replyComment.setUsername(username);
-            replyComment.setRootParentId(parentReview.getRootParentId());
             replyComment.setImmediateParentId(parentReview.getId());
+            if (parentReview.getRootParentId() == -1) {
+                replyComment.setRootParentId(parentReview.getId());
+            } else {
+                replyComment.setRootParentId(parentReview.getRootParentId());
+            }
             if (this.reviewDAO.addReview(replyComment, applicationReleaseDTO.getId(), tenantId)) {
                 ConnectionManagerUtil.commitDBTransaction();
                 return true;
@@ -214,12 +218,24 @@ public class ReviewManagerImpl implements ReviewManager {
             review.setImmediateParentId(reviewDTO.getImmediateParentId());
             review.setCreatedAt(reviewDTO.getCreatedAt());
             review.setModifiedAt(reviewDTO.getModifiedAt());
-            review.setReplyComments(new TreeMap<>());
+            review.setReplies(new ArrayList<>());
             reviews.add(review);
         }
         return reviews;
     }
 
+    private Review reviewDTOToReview(ReviewDTO reviewDTO){
+        Review review = new Review();
+        review.setId(reviewDTO.getId());
+        review.setContent(reviewDTO.getContent());
+        review.setRootParentId(reviewDTO.getRootParentId());
+        review.setImmediateParentId(reviewDTO.getImmediateParentId());
+        review.setCreatedAt(reviewDTO.getCreatedAt());
+        review.setModifiedAt(reviewDTO.getModifiedAt());
+        review.setReplies(new ArrayList<>());
+        return review;
+    }
+
     @Override
     public boolean updateReview(ReviewWrapper updatingReview, int reviewId, String uuid)
             throws ReviewManagementException, ApplicationManagementException {
@@ -283,38 +299,35 @@ public class ReviewManagerImpl implements ReviewManager {
             throws ReviewManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         PaginationResult paginationResult = new PaginationResult();
-        int numOfComments;
-        TreeMap<Integer, ReviewNode<Review>> reviewTree = new TreeMap<>();
+        TreeMap<Integer, ReviewNode<ReviewDTO>> reviewTree = new TreeMap<>();
         if (log.isDebugEnabled()) {
             log.debug("Get all reviewTmps of the application release uuid: " + uuid);
         }
         try {
             ConnectionManagerUtil.openDBConnection();
             List<ReviewDTO> reviewDTOs= this.reviewDAO.getAllReviews(uuid, request, tenantId);
-            List<Review> reviews = reviewDTOToReview(reviewDTOs);
-            reviews.sort(Comparator.comparing(Review::getId));
-
-            for (Review review : reviews) {
-                if (review.getRootParentId() == -1 && review.getImmediateParentId() == -1) {
-                    ReviewNode<Review> rootNode = new ReviewNode<>(review);
-                    reviewTree.put(review.getId(), rootNode);
-                } else if (reviewTree.containsKey(review.getImmediateParentId())) {
-                    ReviewNode<Review> childNode = new ReviewNode<>(review);
-                    reviewTree.get(review.getImmediateParentId()).addChild(childNode);
+            reviewDTOs.sort(Comparator.comparing(ReviewDTO::getId));
+
+            for (ReviewDTO reviewDTO : reviewDTOs) {
+                if (reviewDTO.getRootParentId() == -1 && reviewDTO.getImmediateParentId() == -1) {
+                    ReviewNode<ReviewDTO> rootNode = new ReviewNode<>(reviewDTO);
+                    reviewTree.put(reviewDTO.getId(), rootNode);
+                } else if (reviewTree.containsKey(reviewDTO.getImmediateParentId())) {
+                    ReviewNode<ReviewDTO> childNode = new ReviewNode<>(reviewDTO);
+                    reviewTree.get(reviewDTO.getImmediateParentId()).addChild(childNode);
                 } else {
-                    reviewTree.put(review.getId(), findAndSetChild(reviewTree.get(review.getRootParentId()), review));
+                    reviewTree.put(reviewDTO.getId(), findAndSetChild(reviewTree.get(reviewDTO.getRootParentId()), reviewDTO));
                 }
             }
-            numOfComments = reviewTree.size();
-            if (numOfComments > 0) {
-                paginationResult.setData(new ArrayList<>(reviewTree.values()));
-                paginationResult.setRecordsFiltered(numOfComments);
-                paginationResult.setRecordsTotal(numOfComments);
-            } else {
-                paginationResult.setData(new ArrayList<ReviewTmp>());
-                paginationResult.setRecordsFiltered(0);
-                paginationResult.setRecordsTotal(0);
+            int numOfReviews = reviewTree.size();
+            List<Review> results = new ArrayList<>();
+
+            for (ReviewNode<ReviewDTO> reviewNode : reviewTree.values()){
+                results.add(printTree(null, reviewNode));
             }
+            paginationResult.setData(new ArrayList<>(results));
+            paginationResult.setRecordsFiltered(numOfReviews);
+            paginationResult.setRecordsTotal(numOfReviews);
             return paginationResult;
         } catch (ReviewManagementDAOException e) {
             throw new ReviewManagementException("Error occured while getting all reviewTmps for application uuid: " + uuid,
@@ -326,16 +339,30 @@ public class ReviewManagerImpl implements ReviewManager {
         }
     }
 
-    private ReviewNode<Review> findAndSetChild(ReviewNode<Review> node, Review review) {
-        for (ReviewNode<Review> each : node.getChildren()) {
-            if ((each.getData()).getId() == review.getImmediateParentId()) {
-                ReviewNode<Review> childNode = new ReviewNode<>(review);
+    private ReviewNode<ReviewDTO> findAndSetChild(ReviewNode<ReviewDTO> node, ReviewDTO reviewDTO) {
+        for (ReviewNode<ReviewDTO> each : node.getChildren()) {
+            if ((each.getData()).getId() == reviewDTO.getImmediateParentId()) {
+                ReviewNode<ReviewDTO> childNode = new ReviewNode<>(reviewDTO);
                 each.addChild(childNode);
             }
         }
         return node;
     }
 
+    private Review printTree(Review parentReview, ReviewNode<ReviewDTO> node) {
+        Review review = reviewDTOToReview(node.getData());
+        if (parentReview != null){
+            parentReview.getReplies().add(review);
+        }
+        if (node.getChildren().isEmpty()){
+            return review;
+        }
+        for (ReviewNode<ReviewDTO> reviewDTOReviewNode : node.getChildren()) {
+            printTree(review, reviewDTOReviewNode);
+        }
+        return review;
+    }
+
     @Override
     public boolean deleteReview(String uuid, int reviewId)
             throws ReviewManagementException, ReviewDoesNotExistException {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java
index 57f91e07207..9d53177a031 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java
@@ -453,7 +453,9 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
             @Valid LifecycleChanger lifecycleChanger) {
         ApplicationManager applicationManager = APIUtil.getApplicationManager();
         try {
-            applicationManager.changeLifecycleState(applicationUuid, lifecycleChanger);
+            ApplicationRelease applicationRelease = applicationManager
+                    .changeLifecycleState(applicationUuid, lifecycleChanger);
+            return Response.status(Response.Status.CREATED).entity(applicationRelease).build();
         } catch (BadRequestException e) {
             String msg = "Request payload contains invalid data, hence veryfy the request payload.";
             log.error(msg, e);
@@ -472,7 +474,6 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
             log.error(msg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
         }
-        return Response.status(Response.Status.CREATED).entity("Lifecycle state added successfully.").build();
     }
 
     @GET
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
index 5fb81372298..2b1309639e6 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
@@ -85,7 +85,7 @@ public class ReviewManagementAPIImpl implements ReviewManagementAPI {
             if (isReviewCreated) {
                 return Response.status(Response.Status.CREATED).entity(reviewWrapper).build();
             } else {
-                String msg = "Given reviewTmp is not valid. Please check the reviewTmp payload.";
+                String msg = "Review is not valid. Please check the reviewTmp payload.";
                 log.error(msg);
                 return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
             }

From b19c79bb443506ee47fc9cc715e70757560db499 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 16 May 2019 12:12:24 +0530
Subject: [PATCH 09/13] Create action for change lifecycle

---
 .../src/components/apps/release/LifeCycle.js  |  7 ++--
 .../components/apps/release/LifeCycleGraph.js | 34 +++++++++++-----
 .../components/apps/release/LifecycleModal.js | 40 ++++++++++++++++---
 .../react-app/src/js/actions/index.js         | 25 ++++++++----
 .../react-app/src/js/reducers/index.js        | 11 +++++
 5 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
index 0447bd02131..485ff30e29b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.js
@@ -13,7 +13,8 @@ const mapDispatchToProps = dispatch => ({
 const mapStateToProps = state => {
     return {
         lifecycle: state.lifecycle,
-        currentStatus : state.release.currentStatus.toUpperCase()
+        currentStatus : state.release.currentStatus.toUpperCase(),
+        uuid : state.release.uuid
     };
 };
 
@@ -38,9 +39,9 @@ class ConnectedLifeCycle extends React.Component {
         if (lifecycle != null) {
             return (
                 <div>
-                    <LifecycleModal currentStatus={this.props.currentStatus}/>
+                    <LifecycleModal uuid={this.props.uuid} currentStatus={this.props.currentStatus}/>
                     <Button onClick={this.openModal}>aaaa</Button>
-                    <LifeCycleGraph currentStatus={this.props.currentStatus} lifecycle={this.props.lifecycle}/>
+                    <LifeCycleGraph openModel={this.openModal} currentStatus={this.props.currentStatus} lifecycle={this.props.lifecycle}/>
                 </div>
             );
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
index fa7ae3de7ef..dd22c00eb48 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycleGraph.js
@@ -1,6 +1,11 @@
 import React from "react";
 import {Graph} from 'react-d3-graph';
+import {connect} from "react-redux";
+import {getLifecycle, openLifecycleModal} from "../../../js/actions";
 
+const mapDispatchToProps = dispatch => ({
+    openLifecycleModal: (nextState) => dispatch(openLifecycleModal(nextState))
+});
 
 // the graph configuration, you only need to pass down properties
 // that you want to override, otherwise default ones will be used
@@ -36,11 +41,23 @@ const myConfig = {
     }
 };
 
-const onClickNode = function(nodeId) {
-    window.alert(`Clicked node ${nodeId}`);
-};
 
-class LifeCycleGraph extends React.Component {
+
+class ConnectedLifeCycleGraph extends React.Component {
+
+
+    constructor(props){
+        super(props);
+        this.nextStates = null;
+        this.onClickNode = this.onClickNode.bind(this);
+    }
+
+    onClickNode = function(nodeId) {
+        const nextStates = this.nextStates;
+        if(nextStates.includes(nodeId)){
+            this.props.openLifecycleModal(nodeId);
+        }
+    };
 
     render() {
 // graph payload (with minimalist structure)
@@ -48,7 +65,7 @@ class LifeCycleGraph extends React.Component {
         const lifecycle = this.props.lifecycle;
         const nodes = [];
         const links = [];
-        const nextStates = lifecycle[this.props.currentStatus].proceedingStates;
+        this.nextStates = lifecycle[this.props.currentStatus].proceedingStates;
 
 
         Object.keys(lifecycle).forEach((stateName) => {
@@ -56,7 +73,7 @@ class LifeCycleGraph extends React.Component {
             let color = "rgb(83, 92, 104)";
             if (stateName === this.props.currentStatus) {
                 color = "rgb(39, 174, 96)";
-            } else if (nextStates.includes(stateName)) {
+            } else if (this.nextStates.includes(stateName)) {
                 color = "rgb(0,192,255)";
             }
             let node = {
@@ -67,7 +84,6 @@ class LifeCycleGraph extends React.Component {
 
             //todo: remove checking property
             if (state.hasOwnProperty("proceedingStates")) {
-
                 state.proceedingStates.forEach((proceedingState) => {
                     let link = {
                         source: stateName,
@@ -90,12 +106,12 @@ class LifeCycleGraph extends React.Component {
                     id="graph-id" // id is mandatory, if no id is defined rd3g will throw an error
                     data={data}
                     config={myConfig}
-                    onClickNode={onClickNode}
+                    onClickNode={this.onClickNode}
                 />
             </div>
         );
     }
 }
 
-
+const LifeCycleGraph = connect(null,mapDispatchToProps)(ConnectedLifeCycleGraph);
 export default LifeCycleGraph;
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
index fa1e7194501..e19510bad61 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
@@ -1,7 +1,7 @@
 import React from "react";
-import {Modal, Typography,Icon,Input} from 'antd';
+import {Modal, Typography, Icon, Input, Form, Checkbox, Button} from 'antd';
 import {connect} from 'react-redux';
-import {closeLifecycleModal} from "../../../js/actions";
+import {closeLifecycleModal, updateLifecycleState} from "../../../js/actions";
 
 const { TextArea } = Input;
 const { Title } = Typography;
@@ -15,7 +15,8 @@ const mapStateToProps = state => {
 };
 
 const mapDispatchToProps = dispatch => ({
-    closeLifecycleModal : () => dispatch(closeLifecycleModal())
+    closeLifecycleModal : () => dispatch(closeLifecycleModal()),
+    updateLifecycleState : (uuid, nextState, reason) => dispatch(updateLifecycleState(uuid, nextState, reason))
 });
 
 const Text = Typography;
@@ -24,6 +25,7 @@ class ConnectedLifecycleModal extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
+            loading: false,
             visible: false
         };
     }
@@ -46,14 +48,23 @@ class ConnectedLifecycleModal extends React.Component {
         this.setState({
             visible: false,
         });
+        this.props.closeLifecycleModal();
     };
 
     handleCancel = (e) => {
         this.setState({
             visible: false,
+            loading: false
         });
         this.props.closeLifecycleModal();
     };
+    handleSubmit = event => {
+        this.setState({ loading: true });
+        event.preventDefault();
+        console.log(this.reason);
+        console.log("uuid", this.props.uuid);
+        this.props.updateLifecycleState(this.props.uuid, this.props.nextState, this.reason.state.value)
+    };
 
     render() {
         if (this.props.nextState != null) {
@@ -63,12 +74,31 @@ class ConnectedLifecycleModal extends React.Component {
                     <Modal
                         title="Change State"
                         visible={this.state.visible}
-                        onOk={this.handleOk}
                         onCancel={this.handleCancel}
+                        footer={null}
                     >
                         <Title level={4}>{this.props.currentStatus} <Icon type="arrow-right" /> {nextState}</Title>
                         <p>Reason:</p>
-                        <TextArea placeholder="Please enter the reason..." autosize />
+                        <form onSubmit={this.handleSubmit}>
+                            <Form.Item>
+                                <label htmlFor="username">username</label>
+
+                                <Input placeholder="Basic usage"  ref={(input) => this.reason = input}/>
+                            </Form.Item>
+                            {/*<Form.Item>*/}
+                            {/*<TextArea*/}
+                                {/*placeholder="Please enter the reason..."*/}
+                                {/*ref={(input) => this.input = input}*/}
+                                {/*autosize*/}
+                            {/*/>*/}
+                            {/*</Form.Item>*/}
+                            <Button key="back" onClick={this.handleCancel}>
+                                Cancel
+                            </Button>,
+                            <Button key="submit" type="primary" htmlType="submit" loading={this.state.loading}>
+                                Submit
+                            </Button>
+                        </form>
                     </Modal>
                 </div>
             );
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index f4604d847ec..e37566a2ff9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -27,7 +27,7 @@ export const getApps = () => dispatch => {
 
 export const getRelease = (uuid) => dispatch => {
 
-    const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-publisher/v1.0/applications/release/"+uuid;
+    const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-publisher/v1.0/applications/release/" + uuid;
 
     return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
     ).then(res => {
@@ -49,7 +49,7 @@ export const openReleasesModal = (app) => dispatch => {
     dispatch({
         type: ActionTypes.OPEN_RELEASES_MODAL,
         payload: {
-            app:app
+            app: app
         }
     });
 };
@@ -70,7 +70,7 @@ export const closeLifecycleModal = () => dispatch => {
     });
 };
 
-export const getLifecycle = ()=> dispatch =>{
+export const getLifecycle = () => dispatch => {
     const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-publisher/v1.0/applications/lifecycle-config";
 
     return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
@@ -88,20 +88,31 @@ export const getLifecycle = ()=> dispatch =>{
 };
 
 
-export const updateLifecycleState = (uuid, nextState) => dispatch => {
+export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
 
-    const request = "method=get&content-type=application/json&payload={}&api-endpoint=/applications/lifecycle-config/"+uuid+"?action="+nextState;
+    const payload = {
+        nextState: nextState,
+        reason: reason
+    };
+
+    const request = "method=get&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/applications/lifecycle-config/" + uuid;
+
+    console.log(request);
 
     return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
     ).then(res => {
         if (res.status === 200) {
-            let release = res.data.data;
-            dispatch({type: ActionTypes.GET_RELEASE, payload: release});
+            dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: {currentStatus: nextState}});
         }
 
     }).catch(function (error) {
         if (error.response.status === 401) {
             window.location.href = 'https://localhost:9443/publisher/login';
+        } else if (error.response.status === 500) {
+            dispatch({
+                type: ActionTypes.CLOSE_LIFECYCLE_MODAL
+            });
+            alert("error");
         }
     });
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
index 6d770920f07..74a861fbf45 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
@@ -48,6 +48,17 @@ function rootReducer(state = initialState, action) {
                 nextState: null
             }
         });
+    }else if (action.type === ActionTypes.UPDATE_LIFECYCLE_STATE) {
+        const release = {};
+        return Object.assign({}, state, {
+            lifecycleModal: {
+                visible: false,
+                nextState: null,
+            },
+            release:{
+                currentStatus : action.payload.currentStatus
+            }
+        });
     }
     return state;
 }

From fdd9d77a471b1fd22030bc7e3456434ac8b62a72 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 16 May 2019 14:04:46 +0530
Subject: [PATCH 10/13] Create change lifecycle function

---
 .../react-app/src/js/actions/index.js                     | 8 ++++----
 .../react-app/src/js/reducers/index.js                    | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index e37566a2ff9..5e70f0a49bc 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -87,22 +87,22 @@ export const getLifecycle = () => dispatch => {
     });
 };
 
-
 export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
 
     const payload = {
-        nextState: nextState,
+        action: nextState,
         reason: reason
     };
 
-    const request = "method=get&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/applications/lifecycle-config/" + uuid;
+    const request = "method=get&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/applications/lifecycle/" + uuid;
 
     console.log(request);
 
     return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
     ).then(res => {
         if (res.status === 200) {
-            dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: {currentStatus: nextState}});
+            let release = res.data.data;
+            dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
         }
 
     }).catch(function (error) {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
index 74a861fbf45..a03213ef461 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/reducers/index.js
@@ -49,15 +49,12 @@ function rootReducer(state = initialState, action) {
             }
         });
     }else if (action.type === ActionTypes.UPDATE_LIFECYCLE_STATE) {
-        const release = {};
         return Object.assign({}, state, {
             lifecycleModal: {
                 visible: false,
                 nextState: null,
             },
-            release:{
-                currentStatus : action.payload.currentStatus
-            }
+            release: action.payload
         });
     }
     return state;

From 756324d883f90a94004993142ac291bcb5bed3fc Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 16 May 2019 14:16:36 +0530
Subject: [PATCH 11/13] Fix minor issue in publisher ui lifecycle

---
 .../src/components/apps/release/LifecycleModal.js   |  5 ++---
 .../react-app/src/js/actions/index.js               | 13 ++++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
index e19510bad61..26db61287c6 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
@@ -78,12 +78,11 @@ class ConnectedLifecycleModal extends React.Component {
                         footer={null}
                     >
                         <Title level={4}>{this.props.currentStatus} <Icon type="arrow-right" /> {nextState}</Title>
-                        <p>Reason:</p>
                         <form onSubmit={this.handleSubmit}>
                             <Form.Item>
-                                <label htmlFor="username">username</label>
+                                <label htmlFor="username">Reason</label>
 
-                                <Input placeholder="Basic usage"  ref={(input) => this.reason = input}/>
+                                <Input placeholder="Enter the reason"  ref={(input) => this.reason = input}/>
                             </Form.Item>
                             {/*<Form.Item>*/}
                             {/*<TextArea*/}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index 5e70f0a49bc..5b3d7656200 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -101,18 +101,25 @@ export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
     return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
     ).then(res => {
         if (res.status === 200) {
-            let release = res.data.data;
-            dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
+            if(res.data.data.hasOwnProperty("release")) {
+                let release = res.data.data;
+                dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
+            }else{
+                alert("error");
+                dispatch({
+                    type: ActionTypes.CLOSE_LIFECYCLE_MODAL
+                });
+            }
         }
 
     }).catch(function (error) {
         if (error.response.status === 401) {
             window.location.href = 'https://localhost:9443/publisher/login';
         } else if (error.response.status === 500) {
+            alert("error");
             dispatch({
                 type: ActionTypes.CLOSE_LIFECYCLE_MODAL
             });
-            alert("error");
         }
     });
 

From 6300b7ff98cc023716953b5d37aa8d0014d642f1 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 16 May 2019 14:19:07 +0530
Subject: [PATCH 12/13] Change invoker call of lifecycle in publisher ui

---
 .../react-app/src/js/actions/index.js                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index 5b3d7656200..81ad5273515 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -94,7 +94,7 @@ export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
         reason: reason
     };
 
-    const request = "method=get&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/applications/lifecycle/" + uuid;
+    const request = "method=get&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/applications/life-cycle/" + uuid;
 
     console.log(request);
 

From 26fa7ae1b2bd2dedec03c3f7a67531f92b7dca12 Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 16 May 2019 14:24:06 +0530
Subject: [PATCH 13/13] Change invoker call of lifecycle in publisher ui

---
 .../react-app/src/js/actions/index.js                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index 81ad5273515..d3274757216 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -94,7 +94,7 @@ export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
         reason: reason
     };
 
-    const request = "method=get&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/applications/life-cycle/" + uuid;
+    const request = "method=post&content-type=application/json&payload=" + JSON.stringify(payload) + "&api-endpoint=/application-mgt-publisher/v1.0/applications/life-cycle/" + uuid;
 
     console.log(request);