Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CHeckstyle and JUnit for base package in ONAP-REST
[policy/engine.git]
/
POLICY-SDK-APP
/
src
/
main
/
java
/
org
/
onap
/
policy
/
controller
/
DashboardController.java
diff --git
a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
index
891398a
..
0ca315b
100644
(file)
--- a/
POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
+++ b/
POLICY-SDK-APP/src/main/java/org/onap/policy/controller/DashboardController.java
@@
-61,7
+61,7
@@
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.dao.SystemLogDbDao;
import org.onap.policy.model.PDPGroupContainer;
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.dao.SystemLogDbDao;
import org.onap.policy.model.PDPGroupContainer;
-import org.onap.policy.rest.X
ACML
RestProperties;
+import org.onap.policy.rest.X
acml
RestProperties;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.utils.PolicyUtils;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.utils.PolicyUtils;
@@
-188,7
+188,7
@@
public class DashboardController extends RestrictedBaseController {
model.put("policyStatusCRUDData", mapper.writeValueAsString(policyStatusCrudData));
response.getWriter().write(new JSONObject(new JsonMessage(mapper.writeValueAsString(model))).toString());
} catch (Exception e) {
model.put("policyStatusCRUDData", mapper.writeValueAsString(policyStatusCrudData));
response.getWriter().write(new JSONObject(new JsonMessage(mapper.writeValueAsString(model))).toString());
} catch (Exception e) {
- response.setCharacterEncoding(
"UTF-8"
);
+ response.setCharacterEncoding(
PolicyUtils.CHARACTER_ENCODING
);
PrintWriter out = response.getWriter();
out.write(PolicyUtils.CATCH_EXCEPTION);
}
PrintWriter out = response.getWriter();
out.write(PolicyUtils.CATCH_EXCEPTION);
}
@@
-351,7
+351,7
@@
public class DashboardController extends RestrictedBaseController {
papStatus = "CANNOT_CONNECT";
policyLogger.error("Error getting PAP status, PAP not responding to requests", e1);
}
papStatus = "CANNOT_CONNECT";
policyLogger.error("Error getting PAP status, PAP not responding to requests", e1);
}
- String papUrl = XACMLProperties.getProperty(X
ACML
RestProperties.PROP_PAP_URL);
+ String papUrl = XACMLProperties.getProperty(X
acml
RestProperties.PROP_PAP_URL);
JSONObject object = new JSONObject();
object.put("system", papUrl);
object.put("status", papStatus);
JSONObject object = new JSONObject();
object.put("system", papUrl);
object.put("status", papStatus);