diff options
Diffstat (limited to 'ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain')
2 files changed, 16 insertions, 14 deletions
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java index f0447142..a7b8fc05 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRole.java @@ -46,14 +46,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; * This bean holds the information for a role in the role and user management * REST API. */ -@JsonIgnoreProperties(ignoreUnknown = true) public class EcompRole implements Comparable<EcompRole> { protected Long id; private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set roleFunctions; - + public Set getRoleFunctions() { return roleFunctions; } @@ -103,10 +101,11 @@ public class EcompRole implements Comparable<EcompRole> { return true; } + + @Override public String toString() { - String s = "@EcompRole[id: " + id + "; name: " + name + "]"; - return s; + return "EcompRole [id=" + id + ", name=" + name + ", roleFunctions=" + roleFunctions + "]"; } @Override diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java index 6e108a02..f0ad43e0 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/restful/domain/EcompRoleFunction.java @@ -37,17 +37,11 @@ */ package org.onap.portalsdk.core.restful.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; - -@JsonIgnoreProperties(ignoreUnknown = true) public class EcompRoleFunction implements Comparable<EcompRoleFunction>{ private String name; private String code; - @JsonInclude(JsonInclude.Include.NON_NULL) private String type; - @JsonInclude(JsonInclude.Include.NON_NULL) private String action; @@ -75,10 +69,19 @@ public class EcompRoleFunction implements Comparable<EcompRoleFunction>{ public void setAction(String action) { this.action = action; } + @Override public int compareTo(EcompRoleFunction arg0) { - return this.getCode().compareTo(arg0.getCode()); + int result = this.code.compareTo(arg0.getCode()); + if (result == 0) { + result = this.name.compareTo(arg0.getName()); + } + if (result == 0) { + result = this.type.compareTo(arg0.getType()); + } + if (result == 0) { + result = this.action.compareTo(arg0.getAction()); + } + return result; } - } - |