summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2017-09-25 13:08:29 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-25 13:08:29 +0000
commit7c5217b44e4f238bb8fc3ce68a046f6c149d07df (patch)
tree355449bfb2f09ed4bf15d8d96f2bd2bea00ee393
parent93d709b34c63059495d6bb2e2793dfc3f9ceb361 (diff)
parent08a1edc303dc52433c4310117566f54e36e3b4c4 (diff)
Merge "String literal comparision on left side"
-rw-r--r--POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java4
-rw-r--r--POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java14
2 files changed, 9 insertions, 9 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java
index 21f3793f1..f987f906d 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyNotificationController.java
@@ -64,13 +64,13 @@ public class PolicyNotificationController extends RestrictedBaseController {
String responseValue = "";
try {
String userId = UserUtils.getUserSession(request).getOrgUserId();
- System.out.println(userId);
+ logger.info("userid info: " + userId);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
JsonNode root = mapper.readTree(request.getReader());
String name = root.get("watchData").get("name").toString();
JsonNode pathList = root.get("watchData").get("path");
- String finalName = "";
+ String finalName;
if(pathList.isArray()){
ArrayNode arrayNode = (ArrayNode) pathList;
for (int i = 0; i < arrayNode.size(); i++) {
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
index 04ec3e868..3b3f11957 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
@@ -365,7 +365,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
@Override
public Object firstItemId() {
synchronized (this.groups) {
- if (this.groups.size() > 0) {
+ if (!this.groups.isEmpty()) {
return this.groups.get(0);
}
}
@@ -375,7 +375,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
@Override
public Object lastItemId() {
synchronized (this.groups) {
- if (this.groups.size() > 0) {
+ if (!this.groups.isEmpty()) {
return this.groups.get(this.groups.size() - 1);
}
}
@@ -385,8 +385,8 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
@Override
public boolean isFirstId(Object itemId) {
synchronized (this.groups) {
- if (this.groups.size() > 0) {
- return (this.groups.get(0).equals(itemId));
+ if (!this.groups.isEmpty()) {
+ return this.groups.get(0).equals(itemId);
}
}
return false;
@@ -395,8 +395,8 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
@Override
public boolean isLastId(Object itemId) {
synchronized (this.groups) {
- if (this.groups.size() > 0) {
- return (this.groups.get(this.groups.size() - 1).equals(itemId));
+ if (!this.groups.isEmpty()) {
+ return this.groups.get(this.groups.size() - 1).equals(itemId);
}
}
return false;
@@ -444,7 +444,7 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
//
// You cannot remove the default group
//
- if (((OnapPDPGroup) itemId).getId().equals("Default")) {
+ if ("Default".equals(((OnapPDPGroup) itemId).getId())) {
throw new UnsupportedOperationException("You can't remove the Default Group.");
}
//