diff options
2 files changed, 29 insertions, 78 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/FunctionalMenuRole.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/FunctionalMenuRole.java index 0cb7c0f4..a177334e 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/FunctionalMenuRole.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/FunctionalMenuRole.java @@ -44,90 +44,41 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import javax.validation.constraints.Digits; +import javax.validation.constraints.NotNull; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; @Entity @Table(name="fn_menu_functional_roles") +@Getter +@Setter +@ToString +@EqualsAndHashCode public class FunctionalMenuRole implements Serializable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy=GenerationType.IDENTITY) @Column(name = "ID") + @Digits(integer = 11, fraction = 0) public Integer id; - + @Column(name = "MENU_ID") + @Digits(integer = 11, fraction = 0) + @NotNull public Long menuId; - + @Column(name = "APP_ID") + @Digits(integer = 11, fraction = 0) + @NotNull public Integer appId; - + @Column(name = "ROLE_ID") + @Digits(integer = 11, fraction = 0) + @NotNull public Integer roleId; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Long getMenuId() { - return menuId; - } - - public void setMenuId(Long menuId) { - this.menuId = menuId; - } - - public Integer getAppId() { - return appId; - } - - public void setAppId(Integer appId) { - this.appId = appId; - } - - public Integer getRoleId() { - return roleId; - } - - public void setRoleId(Integer roleId) { - this.roleId = roleId; - } - - @Override - public String toString() { - return "FunctionalMenuRole [id=" + id + ", menuId=" + menuId + ", appId=" + appId + ", roleId=" + roleId + "]"; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((appId == null) ? 0 : appId.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((menuId == null) ? 0 : menuId.hashCode()); - result = prime * result + ((roleId == null) ? 0 : roleId.hashCode()); - return result; - } - - @Override - public boolean equals(Object o) { - - if (o == this) return true; - if (!(o instanceof FunctionalMenuRole)) { - return false; - } - FunctionalMenuRole functionalMenuRole = (FunctionalMenuRole) o; - System.out.println("test"); - return id.equals(functionalMenuRole.getId()) && - menuId.equals(functionalMenuRole.menuId) && - appId.equals(functionalMenuRole.appId) && - roleId.equals(functionalMenuRole.roleId) ; - } - - - - } diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/FunctionalMenuRoleTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/FunctionalMenuRoleTest.java index 3000c2f4..44047322 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/FunctionalMenuRoleTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/FunctionalMenuRoleTest.java @@ -37,41 +37,41 @@ */ package org.onap.portalapp.portal.transport; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.onap.portalapp.portal.transport.FunctionalMenuRole; public class FunctionalMenuRoleTest { public FunctionalMenuRole mockFunctionalMenuRole(){ FunctionalMenuRole functionalMenuRole = new FunctionalMenuRole(); - + functionalMenuRole.setId(1); functionalMenuRole.setMenuId((long)1); functionalMenuRole.setAppId(1); functionalMenuRole.setRoleId(1); - + return functionalMenuRole; } - + @Test public void functionalMenuRoleTest(){ FunctionalMenuRole functionalMenuRole = mockFunctionalMenuRole(); - + FunctionalMenuRole functionalMenuRole1 = new FunctionalMenuRole(); functionalMenuRole1.setId(1); functionalMenuRole1.setMenuId((long)1); functionalMenuRole1.setAppId(1); functionalMenuRole1.setRoleId(1); - + assertEquals(functionalMenuRole.getId().toString(), "1"); assertEquals(functionalMenuRole.getMenuId(), new Long(1)); assertEquals(functionalMenuRole.getAppId().toString(), "1"); assertEquals(functionalMenuRole.getRoleId().toString(), "1"); - assertEquals(functionalMenuRole.toString(), "FunctionalMenuRole [id=1, menuId=1, appId=1, roleId=1]"); + assertEquals(functionalMenuRole.toString(), "FunctionalMenuRole(id=1, menuId=1, appId=1, roleId=1)"); assertTrue(functionalMenuRole.equals(functionalMenuRole1)); assertEquals(functionalMenuRole.hashCode(), functionalMenuRole1.hashCode()); - + } } |