From: Dominik Mizyn Date: Fri, 16 Aug 2019 11:42:43 +0000 (+0200) Subject: Portal Spring Boot version Hibernate implementation X-Git-Tag: 3.2.0~117 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=cd98ec039314de7994eb9b739b1618beb9c77cfa Portal Spring Boot version Hibernate implementation Create classes that represent tables in the original database. Imports fix Issue-ID: PORTAL-705 Change-Id: I6910b57bfdcb14c74b8afc7b9953e585433dd2b2 Signed-off-by: Dominik Mizyn --- diff --git a/portal-BE/pom.xml b/portal-BE/pom.xml index 43d0cae5..9fa93475 100644 --- a/portal-BE/pom.xml +++ b/portal-BE/pom.xml @@ -63,6 +63,21 @@ lombok true + + org.onap.portal.sdk + epsdk-logger + 2.6.0-SNAPSHOT + + + org.onap.portal.sdk + epsdk-logger + 2.6.0-SNAPSHOT + + + org.onap.portal.sdk + epsdk-core + 2.6.0-SNAPSHOT + org.springframework.boot spring-boot-starter-test diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java index 391dbb19..c25f8062 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReport.java @@ -54,6 +54,7 @@ import javax.persistence.Index; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.validation.constraints.Digits; +import javax.validation.constraints.FutureOrPresent; import javax.validation.constraints.NotNull; import javax.validation.constraints.PastOrPresent; import javax.validation.constraints.Pattern; @@ -101,7 +102,6 @@ CREATE TABLE `cr_report` ( @Entity @Embeddable public class CrReport implements Serializable { - @Id @Column(name = "rep_id", length = 11, nullable = false) @Digits(integer = 11, fraction = 0) @@ -167,10 +167,22 @@ public class CrReport implements Serializable { @SafeHtml private String dashboardYn; - public CrReport(final Long repId, final String title, final String descr, final String publicYn, - final String reportXml, final Long createId, final LocalDateTime createDate, final Long maintId, - final LocalDateTime maintDate, final String menuId, final String menuApprovedYn, final Long ownerId, - final Integer folderId, final String dashboardTypeYn, final String dashboardYn) { + public CrReport( + @Digits(integer = 11, fraction = 0) @Positive Long repId, + @Size(max = 100) @SafeHtml @NotNull String title, + @Size(max = 255) @SafeHtml String descr, + @Pattern(regexp = "[YNyn]") @Size(max = 1) @SafeHtml @NotNull String publicYn, + @SafeHtml String reportXml, + @Digits(integer = 11, fraction = 0) @Positive Long createId, + @FutureOrPresent @NotNull LocalDateTime createDate, + @Digits(integer = 11, fraction = 0) Long maintId, + @FutureOrPresent @NotNull LocalDateTime maintDate, + @Size(max = 500) @SafeHtml String menuId, + @Pattern(regexp = "[YNyn]") @Size(max = 1) @SafeHtml @NotNull String menuApprovedYn, + @Digits(integer = 11, fraction = 0) Long ownerId, + @Digits(integer = 11, fraction = 0) @Positive Integer folderId, + @Pattern(regexp = "[YNyn]") @Size(max = 1) @SafeHtml String dashboardTypeYn, + @Pattern(regexp = "[YNyn]") @Size(max = 1) @SafeHtml String dashboardYn) { this.repId = repId; this.title = title; this.descr = descr; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java index 083b6151..44a53d31 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportAccess.java @@ -87,7 +87,8 @@ CREATE TABLE `cr_report_access` ( @IdClass(CrReportAccessId.class) public class CrReportAccess implements Serializable{ @Id - @JoinColumn(name = "rep_id", nullable = false) + @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "rep_id") @Valid private CrReport repId; @Id @@ -96,19 +97,19 @@ public class CrReportAccess implements Serializable{ @Positive @NotNull private Long orderNo; - @Column(name = "role_id") + @Column(name = "role_id", columnDefinition = "decimal(11,0) DEFAULT NULL") @Digits(integer = 11, fraction = 0) @Positive private Long roleId; - @Column(name = "user_id") + @Column(name = "user_id", columnDefinition = "decimal(11,0) DEFAULT NULL") @Digits(integer = 11, fraction = 0) @Positive private Long userId; - @Column(name = "read_only_yn", nullable = false, length = 1, columnDefinition = "character varying(1) default 'n'") + @Column(name = "menu_approved_yn", nullable = false, length = 1, columnDefinition = "character varying(1) default 'n'") @Pattern(regexp = "[YNyn]") @SafeHtml @NotNull - private String readOnlyYn; + private String menuApprovedYn; @NoArgsConstructor @AllArgsConstructor diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java index 2faa6dbd..049057d2 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportFileHistory.java @@ -67,6 +67,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; import org.hibernate.validator.constraints.URL; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `cr_report_file_history` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java index 8966a75e..cae3b3b1 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppFunction.java @@ -64,6 +64,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; import org.onap.portal.domain.db.ep.EpAppFunction.EpAppFunctionId; +import org.onap.portal.domain.db.fn.FnApp; /* CREATE TABLE `ep_app_function` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java index cc364324..c41c55f4 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpAppRoleFunction.java @@ -61,8 +61,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnApp; -import org.onap.portalapp.portal.domain.db.fn.FnRole; +import org.onap.portal.domain.db.fn.FnApp; +import org.onap.portal.domain.db.fn.FnRole; /* CREATE TABLE `ep_app_role_function` ( @@ -82,7 +82,9 @@ CREATE TABLE `ep_app_role_function` ( */ @Table(name = "ep_app_role_function", indexes = { - @Index(name = "UNIQUE KEY", columnList = "app_id, role_id, function_cd", unique = true) + @Index(name = "fk_ep_app_role_function_ep_app_func_role_id", columnList = "app_id, role_id, function_cd", unique = true), + @Index(name = "fk_ep_app_role_function_ep_app_func", columnList = "app_id, function_cd"), + @Index(name = "fk_ep_app_role_function_role_id", columnList = "role_id") }) @NoArgsConstructor @AllArgsConstructor diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java index f0a11685..35e51be6 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroservice.java @@ -66,7 +66,7 @@ import lombok.Setter; import lombok.ToString; import org.hibernate.validator.constraints.SafeHtml; import org.hibernate.validator.constraints.URL; -import org.onap.portalapp.portal.domain.db.fn.FnApp; +import org.onap.portal.domain.db.fn.FnApp; /* CREATE TABLE `ep_microservice` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java index 2abf6aed..5f6e9799 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java @@ -62,7 +62,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `ep_pers_user_app_sort` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java index bc89f51c..060ca425 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetPlacement.java @@ -60,7 +60,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `ep_pers_user_widget_placement` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java index f8fb4060..6c439c8b 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserWidgetSel.java @@ -60,7 +60,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `ep_pers_user_widget_sel` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java index 6bfc233e..80f8676b 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpRoleNotification.java @@ -57,7 +57,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.onap.portalapp.portal.domain.db.fn.FnRole; +import org.onap.portal.domain.db.fn.FnRole; /* CREATE TABLE `ep_role_notification` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java index 977c5da8..47e195a4 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserNotification.java @@ -55,7 +55,6 @@ import javax.persistence.Table; import javax.validation.Valid; import javax.validation.constraints.Digits; import javax.validation.constraints.NotNull; -import javax.validation.constraints.PastOrPresent; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; @@ -63,7 +62,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `ep_user_notification` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java index 473124fd..0d8bfc88 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequest.java @@ -64,8 +64,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnApp; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnApp; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `ep_user_roles_request` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java index 722ffc69..1b27ee7b 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpUserRolesRequestDet.java @@ -61,7 +61,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnRole; +import org.onap.portal.domain.db.fn.FnRole; + /* CREATE TABLE `ep_user_roles_request_det` ( `id` int(11) NOT NULL AUTO_INCREMENT, diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java index ca870644..1a15518f 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWebAnalyticsSource.java @@ -60,7 +60,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnApp; +import org.onap.portal.domain.db.fn.FnApp; /* CREATE TABLE `ep_web_analytics_source` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java index 5b3bec77..c63245cc 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java @@ -60,7 +60,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnUser; /* CREATE TABLE `ep_widget_catalog_parameter` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java index 71eb6930..d2191814 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogRole.java @@ -44,8 +44,6 @@ import javax.persistence.CascadeType; 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.Index; import javax.persistence.JoinColumn; @@ -58,8 +56,8 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.onap.portalapp.portal.domain.db.fn.FnApp; -import org.onap.portalapp.portal.domain.db.fn.FnRole; +import org.onap.portal.domain.db.fn.FnApp; +import org.onap.portal.domain.db.fn.FnRole; /* CREATE TABLE `ep_widget_catalog_role` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java index ffc6667a..79cc6322 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnApp.java @@ -66,6 +66,12 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; import org.hibernate.validator.constraints.URL; +import org.onap.portal.domain.db.ep.EpAppFunction; +import org.onap.portal.domain.db.ep.EpAppRoleFunction; +import org.onap.portal.domain.db.ep.EpMicroservice; +import org.onap.portal.domain.db.ep.EpUserRolesRequest; +import org.onap.portal.domain.db.ep.EpWebAnalyticsSource; +import org.onap.portal.domain.db.ep.EpWidgetCatalogRole; import org.onap.portal.domain.dto.DomainVo; /* @@ -271,13 +277,6 @@ public class FnApp extends DomainVo implements Serializable { fetch = FetchType.LAZY ) private List epMicroservices = new ArrayList<>(); - @OneToMany( - targetEntity = EpPersUserAppManSort.class, - mappedBy = "appId", - cascade = CascadeType.ALL, - fetch = FetchType.LAZY - ) - private List epPersUserAppManSorts = new ArrayList<>(); @OneToMany( targetEntity = FnPersUserAppSel.class, mappedBy = "appId", @@ -285,11 +284,4 @@ public class FnApp extends DomainVo implements Serializable { fetch = FetchType.LAZY ) private List fnPersUserAppSels = new ArrayList<>(); - @OneToMany( - targetEntity = FnWidget.class, - mappedBy = "appId", - cascade = CascadeType.ALL, - fetch = FetchType.LAZY - ) - private List fnWidgets = new ArrayList<>(); } diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java index c0784a25..b817a19d 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzBlobTriggers.java @@ -58,7 +58,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.compositePK.FnQzTriggersId; +import org.onap.portal.domain.db.fn.compositePK.FnQzTriggersId; /* CREATE TABLE `fn_qz_blob_triggers` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java index c3bccae4..21ae8dd2 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzCronTriggers.java @@ -56,7 +56,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.compositePK.FnQzTriggersId; +import org.onap.portal.domain.db.fn.compositePK.FnQzTriggersId; /* CREATE TABLE `fn_qz_cron_triggers` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java index 2956961b..f3f9a948 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpleTriggers.java @@ -58,7 +58,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.compositePK.FnQzTriggersId; +import org.onap.portal.domain.db.fn.compositePK.FnQzTriggersId; /* CREATE TABLE `fn_qz_simple_triggers` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java index 66b22585..cef8f481 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzSimpropTriggers.java @@ -57,7 +57,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.compositePK.FnQzTriggersId; +import org.onap.portal.domain.db.fn.compositePK.FnQzTriggersId; /* CREATE TABLE `fn_qz_simprop_triggers` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java index 1f2bcd10..526de117 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnQzTriggers.java @@ -59,7 +59,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.fn.compositePK.FnQzTriggersId; +import org.onap.portal.domain.db.fn.compositePK.FnQzTriggersId; /* CREATE TABLE `fn_qz_triggers` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java index 20a1d88f..dc457883 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java @@ -66,10 +66,10 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.SafeHtml; -import org.onap.portalapp.portal.domain.db.ep.EpAppRoleFunction; -import org.onap.portalapp.portal.domain.db.ep.EpRoleNotification; -import org.onap.portalapp.portal.domain.db.ep.EpUserRolesRequestDet; -import org.onap.portalapp.portal.domain.db.ep.EpWidgetCatalogRole; +import org.onap.portal.domain.db.ep.EpAppRoleFunction; +import org.onap.portal.domain.db.ep.EpRoleNotification; +import org.onap.portal.domain.db.ep.EpUserRolesRequestDet; +import org.onap.portal.domain.db.ep.EpWidgetCatalogRole; /* CREATE TABLE `fn_role` ( diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java index 41a4e5cf..8a778bfa 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java @@ -79,14 +79,6 @@ import org.onap.portal.domain.db.ep.EpUserNotification; import org.onap.portal.domain.db.ep.EpUserRolesRequest; import org.onap.portal.domain.db.ep.EpWidgetCatalogParameter; import org.onap.portal.domain.dto.DomainVo; -import org.onap.portalapp.portal.domain.DomainVo; -import org.onap.portalapp.portal.domain.db.cr.CrReportFileHistory; -import org.onap.portalapp.portal.domain.db.ep.EpPersUserAppManSort; -import org.onap.portalapp.portal.domain.db.ep.EpPersUserWidgetPlacement; -import org.onap.portalapp.portal.domain.db.ep.EpPersUserWidgetSel; -import org.onap.portalapp.portal.domain.db.ep.EpUserNotification; -import org.onap.portalapp.portal.domain.db.ep.EpUserRolesRequest; -import org.onap.portalapp.portal.domain.db.ep.EpWidgetCatalogParameter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -404,13 +396,6 @@ public class FnUser extends DomainVo implements UserDetails { fetch = FetchType.LAZY ) private List persUserAppSels = new ArrayList<>(); - @OneToMany( - targetEntity = EpPersUserAppManSort.class, - mappedBy = "userId", - cascade = CascadeType.ALL, - fetch = FetchType.LAZY - ) - private List epPersUserAppManSorts = new ArrayList<>(); @OneToMany( targetEntity = EpWidgetCatalogParameter.class, mappedBy = "userId", diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java index f6419940..6006a1b2 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/DomainVo.java @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.onap.portalapp.portal.domain.db.fn.FnUser; +import org.onap.portal.domain.db.fn.FnUser; import org.onap.portalsdk.core.domain.FusionVo; @Getter diff --git a/portal-BE/src/main/resources/application.properties b/portal-BE/src/main/resources/application.properties index 8b137891..27893d81 100644 --- a/portal-BE/src/main/resources/application.properties +++ b/portal-BE/src/main/resources/application.properties @@ -1 +1,10 @@ - +spring.jpa.database=mysql +spring.jpa.show-sql=true +spring.jpa.hibernate.ddl-auto=update +spring.h2.console.enabled=true +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.datasource.initialization-mode=always +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect \ No newline at end of file