Merge "Sonar fix: make "dateFormat" an instance variable"

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / domain / EPUserApp.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
index 64ed4ac..424a915 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPUserApp.java
@@ -37,16 +37,20 @@
  */
 package org.onap.portalapp.portal.domain;
 
+import javax.validation.Valid;
+import org.onap.portalsdk.core.domain.support.DomainVo;
 
 @SuppressWarnings("rawtypes")
-public class EPUserApp implements java.io.Serializable, Comparable {
+public class EPUserApp extends DomainVo implements java.io.Serializable, Comparable {
 
        private static final long serialVersionUID = 1L;
        
        private Long userId;
+       @Valid
        private EPApp app;
+       @Valid
        private EPRole role;
-       private Short priority;
+       private Integer priority;
        
        public EPUserApp() {
        }
@@ -93,11 +97,11 @@ public class EPUserApp implements java.io.Serializable, Comparable {
                this.role = role;
        }
                
-       public Short getPriority() {
-               return this.priority;
+       public Integer getPriority() {
+               return (this.priority == null) ? 1 : priority;
        }
 
-       public void setPriority(Short priority) {
+       public void setPriority(Integer priority) {
                this.priority = priority;
        }