Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "LanguageController tests up"
[portal.git]
/
portal-BE
/
src
/
main
/
java
/
org
/
onap
/
portal
/
domain
/
db
/
fn
/
FnLanguage.java
diff --git
a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
index
f8dfac2
..
d9aff94
100644
(file)
--- a/
portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
+++ b/
portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLanguage.java
@@
-40,11
+40,18
@@
package org.onap.portal.domain.db.fn;
package org.onap.portal.domain.db.fn;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.validation.constraints.Digits;
import javax.validation.constraints.NotNull;
import javax.persistence.Table;
import javax.validation.constraints.Digits;
import javax.validation.constraints.NotNull;
@@
-53,6
+60,7
@@
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import lombok.ToString;
import org.hibernate.validator.constraints.SafeHtml;
/*
CREATE TABLE `fn_language` (
import org.hibernate.validator.constraints.SafeHtml;
/*
CREATE TABLE `fn_language` (
@@
-66,25
+74,35
@@
CREATE TABLE `fn_language` (
@Table(name = "fn_language")
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "fn_language")
@NoArgsConstructor
@AllArgsConstructor
+@ToString
@Getter
@Setter
@Entity
@Getter
@Setter
@Entity
+@JsonInclude()
+@SequenceGenerator(name="seq", initialValue=1000, allocationSize=100000)
public class FnLanguage {
@Id
public class FnLanguage {
@Id
- @GeneratedValue(strategy = GenerationType.
AUTO
)
+ @GeneratedValue(strategy = GenerationType.
SEQUENCE, generator = "seq"
)
@Column(name = "language_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
@Digits(integer = 11, fraction = 0)
private Long languageId;
@Column(name = "language_name", length = 100, nullable = false)
@Size(max = 100)
@Column(name = "language_id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
@Digits(integer = 11, fraction = 0)
private Long languageId;
@Column(name = "language_name", length = 100, nullable = false)
@Size(max = 100)
- @NotNull
+ @NotNull
(message = "languageName must not be null")
@SafeHtml
private String languageName;
@Column(name = "language_alias", length = 100, nullable = false)
@Size(max = 100)
@SafeHtml
private String languageName;
@Column(name = "language_alias", length = 100, nullable = false)
@Size(max = 100)
- @NotNull
+ @NotNull
(message = "languageAlias must not be null")
@SafeHtml
private String languageAlias;
@SafeHtml
private String languageAlias;
+ @OneToMany(
+ targetEntity = FnUser.class,
+ mappedBy = "languageId",
+ cascade = CascadeType.ALL,
+ fetch = FetchType.EAGER
+ )
+ private List<FnUser> fnUsers = new ArrayList<>();
}
}