Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
getAppRolesForUser() method up in UserRolesController
[portal.git]
/
portal-BE
/
src
/
main
/
java
/
org
/
onap
/
portal
/
domain
/
db
/
fn
/
FnFunction.java
diff --git
a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
index
1635351
..
7bd9c38
100644
(file)
--- a/
portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
+++ b/
portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnFunction.java
@@
-40,8
+40,8
@@
package org.onap.portal.domain.db.fn;
package org.onap.portal.domain.db.fn;
-import java.
util.ArrayList
;
-import java.util.
Lis
t;
+import java.
io.Serializable
;
+import java.util.
Se
t;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@
-52,6
+52,7
@@
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.AllArgsConstructor;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@
-68,10
+69,11
@@
CREATE TABLE `fn_function` (
@Table(name = "fn_function")
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "fn_function")
@NoArgsConstructor
@AllArgsConstructor
+@Builder
@Getter
@Setter
@Entity
@Getter
@Setter
@Entity
-public class FnFunction {
+public class FnFunction
implements Serializable
{
@Id
@Column(name = "function_cd", length = 30, nullable = false)
@Size(max = 30)
@Id
@Column(name = "function_cd", length = 30, nullable = false)
@Size(max = 30)
@@
-82,25
+84,29
@@
public class FnFunction {
@SafeHtml
@NotNull
private String functionName;
@SafeHtml
@NotNull
private String functionName;
+ private String code;
+ private String name;
+ private String type;
+ private String action;
@OneToMany(
targetEntity = FnRestrictedUrl.class,
mappedBy = "functionCd",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
@OneToMany(
targetEntity = FnRestrictedUrl.class,
mappedBy = "functionCd",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
- private
List<FnRestrictedUrl> fnRestrictedUrls = new ArrayList<>()
;
+ private
Set<FnRestrictedUrl> fnRestrictedUrls
;
@OneToMany(
targetEntity = FnRoleFunction.class,
mappedBy = "functionCd",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
@OneToMany(
targetEntity = FnRoleFunction.class,
mappedBy = "functionCd",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
- private
List<FnRoleFunction> fnRoleFunctions = new ArrayList<>()
;
+ private
Set<FnRoleFunction> fnRoleFunctions
;
@OneToMany(
targetEntity = FnTab.class,
mappedBy = "functionCd",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
@OneToMany(
targetEntity = FnTab.class,
mappedBy = "functionCd",
cascade = CascadeType.ALL,
fetch = FetchType.LAZY
)
- private
List<FnTab> fnTabs = new ArrayList<>()
;
+ private
Set<FnTab> fnTabs
;
}
}