From 2eaf7baff879929156699033bf62d29c0fd0040f Mon Sep 17 00:00:00 2001 From: Dominik Mizyn Date: Wed, 28 Aug 2019 17:05:57 +0200 Subject: [PATCH] Transport DTO up Transport DTO up and some minor fixes Issue-ID: PORTAL-710 Signed-off-by: Dominik Mizyn Change-Id: I867164cb1f562d394f13efa6b3a9d27fb903755e --- .../org/onap/portal/controller/UserController.java | 4 +- .../onap/portal/domain/builder/FnUserBuilder.java | 1 - .../org/onap/portal/domain/db/cr/CrLuFileType.java | 1 - .../org/onap/portal/domain/db/cr/CrReport.java | 3 +- .../portal/domain/db/cr/CrReportEmailSentLog.java | 2 - .../portal/domain/db/cr/CrReportFileHistory.java | 2 - .../portal/domain/db/cr/CrReportScheduleUsers.java | 1 - .../portal/domain/db/cr/CrReportTemplateMap.java | 2 - .../portal/domain/db/cr/CrScheduleActivityLog.java | 1 - .../onap/portal/domain/db/cr/CrTableSource.java | 2 - .../onap/portal/domain/db/ep/EpMicroservice.java | 1 - .../domain/db/ep/EpMicroserviceParameter.java | 1 - .../java/org/onap/portal/domain/db/ep/EpMlRec.java | 1 - .../org/onap/portal/domain/db/ep/EpMlUser.java | 1 - .../org/onap/portal/domain/db/fn/FnChatLogs.java | 2 - .../org/onap/portal/domain/db/fn/FnLanguage.java | 12 +-- .../org/onap/portal/domain/db/fn/FnLuRoleType.java | 2 - .../java/org/onap/portal/domain/db/fn/FnOrg.java | 1 - .../onap/portal/domain/db/fn/FnQzBlobTriggers.java | 1 - .../onap/portal/domain/db/fn/FnQzCronTriggers.java | 1 - .../portal/domain/db/fn/FnQzSimpleTriggers.java | 1 - .../portal/domain/db/fn/FnQzSimpropTriggers.java | 1 - .../java/org/onap/portal/domain/db/fn/FnUser.java | 2 - .../org/onap/portal/domain/db/fn/FnUserRole.java | 1 - .../java/org/onap/portal/domain/dto/DomainVo.java | 2 - .../onap/portal/domain/dto/PortalRestResponse.java | 86 +++------------ .../portal/domain/dto/PortalRestStatusEnum.java | 2 +- .../onap/portal/domain/dto/fn/FnLanguageDto.java | 1 - .../org/onap/portal/domain/dto/fn/FnUserDto.java | 1 - .../dto/transport/AllAppsWithRolesForUser.java | 70 ++++++++++++ .../portal/domain/dto/transport/Analytics.java | 67 ++++++++++++ .../dto/transport/AppCatalogPersonalization.java | 59 +++++++++++ .../domain/dto/transport/AppNameIdIsAdmin.java | 59 +++++++++++ .../domain/dto/transport/AppWithRolesForUser.java | 65 ++++++++++++ .../dto/transport/AppsListWithAdminRole.java | 58 ++++++++++ .../dto/transport/BulkUploadRoleFunction.java | 66 ++++++++++++ .../domain/dto/transport/BulkUploadUserRoles.java | 65 ++++++++++++ .../dto/transport/BusinessCardApplicationRole.java | 64 +++++++++++ .../BusinessCardApplicationRolesList.java | 62 +++++++++++ .../portal/domain/dto/transport/CentralApp.java | 84 +++++++++++++++ .../portal/domain/dto/transport/CentralRole.java | 75 +++++++++++++ .../domain/dto/transport/CentralRoleFunction.java | 88 ++++++++++++++++ .../portal/domain/dto/transport/CentralUser.java | 115 ++++++++++++++++++++ .../domain/dto/transport/CentralUserApp.java | 71 +++++++++++++ .../portal/domain/dto/transport/CentralV2Role.java | 102 ++++++++++++++++++ .../dto/transport/CentralV2RoleFunction.java | 103 ++++++++++++++++++ .../portal/domain/dto/transport/CentralV2User.java | 117 +++++++++++++++++++++ .../domain/dto/transport/CentralV2UserApp.java | 72 +++++++++++++ .../domain/dto/transport/CentralizedAppRoles.java | 62 +++++++++++ .../portal/domain/dto/transport/CommonWidget.java | 96 +++++++++++++++++ .../domain/dto/transport/CommonWidgetMeta.java | 64 +++++++++++ .../dto/transport/EPAppsManualPreference.java | 77 ++++++++++++++ .../domain/dto/transport/EPAppsSortPreference.java | 61 +++++++++++ .../dto/transport/EPDeleteAppsManualSortPref.java | 58 ++++++++++ .../dto/transport/EPUserAppCurrentRoles.java | 64 +++++++++++ .../dto/transport/EPWidgetsSortPreference.java | 69 ++++++++++++ .../domain/dto/transport/EcompUserAppRoles.java | 65 ++++++++++++ .../domain/dto/transport/EcompUserRoles.java | 80 ++++++++++++++ .../domain/dto/transport/EpNotificationItem.java | 102 ++++++++++++++++++ .../dto/transport/EpNotificationItemExtVO.java | 67 ++++++++++++ .../domain/dto/transport/EpNotificationItemVO.java | 82 +++++++++++++++ .../dto/transport/EpRoleNotificationItem.java | 67 ++++++++++++ .../domain/dto/transport/ExternalAccessPerms.java | 78 ++++++++++++++ .../dto/transport/ExternalAccessPermsDetail.java | 73 +++++++++++++ .../domain/dto/transport/ExternalAccessRole.java | 60 +++++++++++ .../dto/transport/ExternalAccessRolePerms.java | 57 ++++++++++ .../domain/dto/transport/ExternalAccessUser.java | 57 ++++++++++ .../transport/ExternalAccessUserRoleDetail.java | 59 +++++++++++ .../domain/dto/transport/ExternalAuthUserRole.java | 61 +++++++++++ .../transport/ExternalRequestFieldsValidator.java | 57 ++++++++++ .../dto/transport/ExternalRoleDescription.java | 56 ++++++++++ .../dto/transport/FavoritesFunctionalMenuItem.java | 62 +++++++++++ .../transport/FavoritesFunctionalMenuItemJson.java | 65 ++++++++++++ .../domain/dto/transport/FieldsValidator.java | 72 +++++++++++++ .../domain/dto/transport/FunctionalMenuItem.java | 97 +++++++++++++++++ .../dto/transport/FunctionalMenuItemWithRoles.java | 74 +++++++++++++ .../domain/dto/transport/FunctionalMenuRole.java | 71 +++++++++++++ .../GlobalRoleWithApplicationRoleFunction.java | 68 ++++++++++++ .../portal/domain/dto/transport/LocalRole.java | 64 +++++++++++ .../portal/domain/dto/transport/OnboardingApp.java | 106 +++++++++++++++++++ .../domain/dto/transport/OnboardingWidget.java | 79 ++++++++++++++ .../portal/domain/dto/transport/PortalAdmin.java | 72 +++++++++++++ .../domain/dto/transport/PortalAdminUserRole.java | 65 ++++++++++++ .../domain/dto/{ => transport}/ProfileDetail.java | 36 ++----- .../portal/domain/dto/transport/RemoteRole.java | 66 ++++++++++++ .../portal/domain/dto/transport/RemoteRoleV1.java | 64 +++++++++++ .../domain/dto/transport/RemoteUserWithRoles.java | 76 +++++++++++++ .../domain/dto/transport/RoleInAppForUser.java | 67 ++++++++++++ .../domain/dto/transport/RolesInAppForUser.java | 60 +++++++++++ .../domain/dto/transport/UserApplicationRoles.java | 64 +++++++++++ .../dto/transport/UserWithNameSurnameTitle.java | 61 +++++++++++ .../transport/WidgetCatalogPersonalization.java | 57 ++++++++++ .../org/onap/portal/logging/logic/EPLogUtil.java | 2 +- .../org/onap/portal/validation/DataValidator.java | 1 - .../src/main/resources/application.properties | 2 +- .../onap/portal/controller/UserControllerTest.java | 3 +- .../onap/portal/service/fn/FnUserServiceTest.java | 1 - 97 files changed, 4478 insertions(+), 150 deletions(-) create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AllAppsWithRolesForUser.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/Analytics.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppCatalogPersonalization.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppNameIdIsAdmin.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppWithRolesForUser.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppsListWithAdminRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadRoleFunction.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadUserRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRolesList.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralApp.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRoleFunction.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUser.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUserApp.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2Role.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2User.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralizedAppRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidgetMeta.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsManualPreference.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsSortPreference.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPDeleteAppsManualSortPref.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPUserAppCurrentRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPWidgetsSortPreference.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserAppRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemExtVO.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPermsDetail.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRolePerms.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUser.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUserRoleDetail.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAuthUserRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRequestFieldsValidator.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRoleDescription.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItem.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItemJson.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FieldsValidator.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItem.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItemWithRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/GlobalRoleWithApplicationRoleFunction.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/LocalRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingApp.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdmin.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdminUserRole.java rename portal-BE/src/main/java/org/onap/portal/domain/dto/{ => transport}/ProfileDetail.java (71%) create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRole.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRoleV1.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteUserWithRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RoleInAppForUser.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RolesInAppForUser.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserApplicationRoles.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserWithNameSurnameTitle.java create mode 100644 portal-BE/src/main/java/org/onap/portal/domain/dto/transport/WidgetCatalogPersonalization.java diff --git a/portal-BE/src/main/java/org/onap/portal/controller/UserController.java b/portal-BE/src/main/java/org/onap/portal/controller/UserController.java index d339e455..abc91855 100644 --- a/portal-BE/src/main/java/org/onap/portal/controller/UserController.java +++ b/portal-BE/src/main/java/org/onap/portal/controller/UserController.java @@ -41,17 +41,15 @@ package org.onap.portal.controller; import java.security.Principal; -import lombok.NoArgsConstructor; import org.onap.portal.domain.db.fn.FnUser; import org.onap.portal.domain.dto.PortalRestResponse; import org.onap.portal.domain.dto.PortalRestStatusEnum; -import org.onap.portal.domain.dto.ProfileDetail; +import org.onap.portal.domain.dto.transport.ProfileDetail; import org.onap.portal.service.fn.FnUserService; import org.onap.portal.validation.DataValidator; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.onboarding.util.CipherUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.session.SessionRegistry; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/builder/FnUserBuilder.java b/portal-BE/src/main/java/org/onap/portal/domain/builder/FnUserBuilder.java index fe8aadb6..ccf20aa3 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/builder/FnUserBuilder.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/builder/FnUserBuilder.java @@ -42,7 +42,6 @@ package org.onap.portal.domain.builder; import java.time.LocalDateTime; import java.util.Set; -import java.util.UUID; import javax.validation.Valid; import javax.validation.constraints.Digits; import javax.validation.constraints.Email; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java index 83c28662..21ac92b0 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrLuFileType.java @@ -40,7 +40,6 @@ package org.onap.portal.domain.db.cr; -import java.util.ArrayList; import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; 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 16b0512f..791518d2 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 @@ -60,7 +60,6 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Positive; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -111,7 +110,7 @@ public class CrReport implements Serializable { @SafeHtml @NotNull private String title; - @Column(name = "descr", length = 255, columnDefinition = "varchar(255) DEFAULT NULL") + @Column(name = "descr", columnDefinition = "varchar(255) DEFAULT NULL") @Size(max = 255) @SafeHtml private String descr; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java index cb36395b..da87cf75 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportEmailSentLog.java @@ -45,8 +45,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; 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 53daa684..510e1958 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 @@ -41,8 +41,6 @@ package org.onap.portal.domain.db.cr; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java index b607671f..fe8e4b11 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportScheduleUsers.java @@ -41,7 +41,6 @@ package org.onap.portal.domain.db.cr; import java.io.Serializable; -import java.math.BigInteger; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java index ee176140..88f056bf 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrReportTemplateMap.java @@ -42,8 +42,6 @@ package org.onap.portal.domain.db.cr; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.NotNull; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java index 9c4f88bf..d6f8ac6e 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrScheduleActivityLog.java @@ -46,7 +46,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.Digits; -import javax.validation.constraints.FutureOrPresent; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java index b37b2c08..ebe15c40 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/cr/CrTableSource.java @@ -40,8 +40,6 @@ package org.onap.portal.domain.db.cr; -import java.util.ArrayList; -import java.util.List; import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; 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 aa43fbe3..2388c53e 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 @@ -62,7 +62,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import lombok.ToString; import org.hibernate.validator.constraints.SafeHtml; import org.hibernate.validator.constraints.URL; import org.onap.portal.domain.db.fn.FnApp; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java index c66ca723..30de49a5 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMicroserviceParameter.java @@ -61,7 +61,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import lombok.ToString; import org.hibernate.validator.constraints.SafeHtml; /* diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java index 190405cd..08c5fdf7 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlRec.java @@ -48,7 +48,6 @@ import javax.persistence.Id; import javax.persistence.IdClass; import javax.persistence.Table; import javax.validation.constraints.NotNull; -import javax.validation.constraints.PastOrPresent; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java index 59ff5608..c47f3d31 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpMlUser.java @@ -49,7 +49,6 @@ import javax.persistence.IdClass; import javax.persistence.Table; import javax.validation.constraints.Digits; import javax.validation.constraints.NotNull; -import javax.validation.constraints.PastOrPresent; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java index ab24e295..93a07f1c 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnChatLogs.java @@ -43,8 +43,6 @@ package org.onap.portal.domain.db.fn; import java.time.LocalDateTime; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.Size; 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 a5255f30..57fd9993 100644 --- 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 @@ -59,7 +59,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import lombok.ToString; import org.hibernate.validator.constraints.SafeHtml; /* CREATE TABLE `fn_language` ( @@ -106,11 +105,10 @@ public class FnLanguage { @Override public String toString() { - final StringBuilder sb = new StringBuilder("FnLanguage{"); - sb.append("languageId=").append(languageId); - sb.append(", languageName='").append(languageName).append('\''); - sb.append(", languageAlias='").append(languageAlias).append('\''); - sb.append('}'); - return sb.toString(); + String sb = "FnLanguage{" + "languageId=" + languageId + + ", languageName='" + languageName + '\'' + + ", languageAlias='" + languageAlias + '\'' + + '}'; + return sb; } } diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java index 63b74c18..9f500219 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnLuRoleType.java @@ -42,8 +42,6 @@ package org.onap.portal.domain.db.fn; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.Digits; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java index 14bd194a..46f9dcc3 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnOrg.java @@ -58,7 +58,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import lombok.ToString; import org.hibernate.validator.constraints.SafeHtml; /* 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 74765c06..c110fdc6 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 @@ -53,7 +53,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; 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 82968f40..4013e4f6 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 @@ -51,7 +51,6 @@ import javax.persistence.Table; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; 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 23ca4c31..6c1f355f 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 @@ -53,7 +53,6 @@ import javax.validation.constraints.Digits; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; 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 23a3e06e..378705c9 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 @@ -52,7 +52,6 @@ import javax.validation.Valid; import javax.validation.constraints.Digits; import javax.validation.constraints.Size; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; 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 1399dd5c..dffa7f72 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 @@ -55,8 +55,6 @@ import javax.persistence.Index; import javax.persistence.JoinColumn; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java index fb23405e..da709e31 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java @@ -58,7 +58,6 @@ import javax.persistence.UniqueConstraint; import javax.validation.Valid; import javax.validation.constraints.Digits; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; 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 6c722bf2..e14b9372 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 @@ -50,7 +50,6 @@ import java.util.Set; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -59,7 +58,6 @@ import org.onap.portalsdk.core.domain.FusionVo; @Getter @Setter - @NoArgsConstructor @AllArgsConstructor @Inheritance(strategy = InheritanceType.JOINED) diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestResponse.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestResponse.java index f1ca07f5..9e02694b 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestResponse.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestResponse.java @@ -40,83 +40,23 @@ package org.onap.portal.domain.dto; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor public class PortalRestResponse { private PortalRestStatusEnum status; private String message; - private T response; - - public PortalRestResponse(){}; - - public PortalRestResponse(PortalRestStatusEnum status, String message, T response){ - this.status = status; - this.message = message; - this.response = response; - } - - public PortalRestStatusEnum getStatus() { - return status; - } - - public void setStatus(PortalRestStatusEnum status) { - this.status = status; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - public T getResponse() { - return response; - } - - public void setResponse(T response) { - this.response = response; - } - - @Override - public String toString() { - return "PortalRestResponse [status=" + status + ", message=" + message + ", response=" + response + "]"; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((message == null) ? 0 : message.hashCode()); - result = prime * result + ((response == null) ? 0 : response.hashCode()); - result = prime * result + ((status == null) ? 0 : status.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PortalRestResponse other = (PortalRestResponse) obj; - if (message == null) { - if (other.message != null) - return false; - } else if (!message.equals(other.message)) - return false; - if (response == null) { - if (other.response != null) - return false; - } else if (!response.equals(other.response)) - return false; - if (status != other.status) - return false; - return true; - }; - - } diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestStatusEnum.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestStatusEnum.java index 0a175f65..f75cb54b 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestStatusEnum.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/PortalRestStatusEnum.java @@ -46,7 +46,7 @@ public enum PortalRestStatusEnum{ ERROR("error"); private String value; - private PortalRestStatusEnum(String value){ + PortalRestStatusEnum(String value){ this.value = value; } diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnLanguageDto.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnLanguageDto.java index 8dfbda5e..c53c1280 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnLanguageDto.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnLanguageDto.java @@ -44,7 +44,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import lombok.ToString; @Setter @Getter diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnUserDto.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnUserDto.java index 0da1f591..f8ae95d2 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnUserDto.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/fn/FnUserDto.java @@ -45,7 +45,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import lombok.ToString; @Setter @Getter diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AllAppsWithRolesForUser.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AllAppsWithRolesForUser.java new file mode 100644 index 00000000..472da5ab --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AllAppsWithRolesForUser.java @@ -0,0 +1,70 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class AllAppsWithRolesForUser { + + private String orgUserId; + private List apps; + + @Getter + @Setter + @AllArgsConstructor + @NoArgsConstructor + public static class AppWithUserRoles { + + private Long appId; + private String appName; + private List appRoles; + + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/Analytics.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/Analytics.java new file mode 100644 index 00000000..d90cf03b --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/Analytics.java @@ -0,0 +1,67 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class Analytics { + @SafeHtml + private String action; + @SafeHtml + private String page; + @SafeHtml + private String function; + @SafeHtml + private String userid; + @SafeHtml + private String type; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppCatalogPersonalization.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppCatalogPersonalization.java new file mode 100644 index 00000000..982feb20 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppCatalogPersonalization.java @@ -0,0 +1,59 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class AppCatalogPersonalization { + + private Long appId; + private Boolean select; + private Boolean pending; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppNameIdIsAdmin.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppNameIdIsAdmin.java new file mode 100644 index 00000000..ee999566 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppNameIdIsAdmin.java @@ -0,0 +1,59 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class AppNameIdIsAdmin { + + private Long id; + private String appName; + private Boolean isAdmin; + private Boolean restrictedApp; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppWithRolesForUser.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppWithRolesForUser.java new file mode 100644 index 00000000..ad3b6248 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppWithRolesForUser.java @@ -0,0 +1,65 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class AppWithRolesForUser { + + private String orgUserId; + private boolean isSystemUser; + private Long appId; + private String appName; + private List appRoles; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppsListWithAdminRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppsListWithAdminRole.java new file mode 100644 index 00000000..9769dd15 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/AppsListWithAdminRole.java @@ -0,0 +1,58 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.ArrayList; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class AppsListWithAdminRole { + + private String orgUserId; + private ArrayList appsRoles = new ArrayList<>(); + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadRoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadRoleFunction.java new file mode 100644 index 00000000..74357c5c --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadRoleFunction.java @@ -0,0 +1,66 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BulkUploadRoleFunction implements Serializable{ + + + private static final long serialVersionUID = -1880947347092068841L; + + private String functionName; + private String functionCd; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadUserRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadUserRoles.java new file mode 100644 index 00000000..7cb77560 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BulkUploadUserRoles.java @@ -0,0 +1,65 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BulkUploadUserRoles implements Serializable{ + + private static final long serialVersionUID = -7478654947593502185L; + + private String roleName; + private String orgUserId; + private String appNameSpace; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRole.java new file mode 100644 index 00000000..2b24a0db --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRole.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BusinessCardApplicationRole implements Serializable{ + + private static final long serialVersionUID = 1L; + + private String appName; + private String roleName; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRolesList.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRolesList.java new file mode 100644 index 00000000..2a6b3e1d --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/BusinessCardApplicationRolesList.java @@ -0,0 +1,62 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BusinessCardApplicationRolesList { + + private String appName; + private List roleNames; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralApp.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralApp.java new file mode 100644 index 00000000..20060e45 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralApp.java @@ -0,0 +1,84 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class CentralApp implements Serializable{ + + private static final long serialVersionUID = -3325965646585871632L; + private Long id; + private Date created; + private Date modified; + private Long createdId; + private Long modifiedId; + private Long rowNum; + private String name; // app_name + private String imageUrl; // app_image_url + private String description; // app_description + private String notes; // app_notes + private String url; // app_url + private String alternateUrl; // app_alternate_url + private String restEndpoint; // app_rest_endpoint + private String mlAppName; // ml_app_name + private String mlAppAdminId; // ml_app_admin_id; + private String motsId; // mots_id + private String appPassword; // app_password + private String open; + private String enabled; + private byte[] thumbnail; + private String username; // app_username + private String uebKey; // ueb_key + private String uebSecret; // ueb_secret + private String uebTopicName; // ueb_topic_name + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRole.java new file mode 100644 index 00000000..a38aa05c --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRole.java @@ -0,0 +1,75 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.Date; +import java.util.SortedSet; +import java.util.TreeSet; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CentralRole implements Serializable { + + private static final long serialVersionUID = -9210905386086213882L; + + private Long id; + private Date created; + private Date modified; + private Long createdId; + private Long modifiedId; + private Long rowNum; + private String name; + private boolean active; + private Integer priority; + private SortedSet roleFunctions = new TreeSet<>(); + private SortedSet childRoles; + private SortedSet parentRoles; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRoleFunction.java new file mode 100644 index 00000000..9740782b --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralRoleFunction.java @@ -0,0 +1,88 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.Date; +import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class CentralRoleFunction implements Serializable, Comparable { + + private static final long serialVersionUID = 1990254299529285610L; + + private Long id; + private Date created; + private Date modified; + private Long createdId; + private Long modifiedId; + private Serializable auditUserId; + private transient Set auditTrail; + private Long rowNum; + private String code; + private String name; + private String editUrl; + + public CentralRoleFunction(String code, String name) { + this.code = code; + this.name = name; + } + + @Override + public int compareTo(Object obj) { + String c1 = getName(); + String c2 = ((CentralRoleFunction) obj).getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUser.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUser.java new file mode 100644 index 00000000..744dc366 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUser.java @@ -0,0 +1,115 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.Date; +import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CentralUser implements Serializable { + + private static final long serialVersionUID = 7060454665330579923L; + + private Long id; + private Date created; + private Date modified; + private Long createdId; + private Long modifiedId; + private Long rowNum; + private Long orgId; + private Long managerId; + private String firstName; + private String middleInitial; + private String lastName; + private String phone; + private String fax; + private String cellular; + private String email; + private Long addressId; + private String alertMethodCd; + private String hrid; + private String orgUserId; + private String orgCode; + private String address1; + private String address2; + private String city; + private String state; + private String zipCode; + private String country; + private String orgManagerUserId; + private String locationClli; + private String businessCountryCode; + private String businessCountryName; + private String businessUnit; + private String businessUnitName; + private String department; + private String departmentName; + private String companyCode; + private String company; + private String zipCodeSuffix; + private String jobTitle; + private String commandChain; + private String siloStatus; + private String costCenter; + private String financialLocCode; + private String loginId; + private String loginPwd; + private Date lastLoginDate; + private boolean active; + private boolean internal; + private Long selectedProfileId; + private Long timeZoneId; + private boolean online; + private String chatId; + private Set userApps; + private Set pseudoRoles; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUserApp.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUserApp.java new file mode 100644 index 00000000..53e071ff --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralUserApp.java @@ -0,0 +1,71 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class CentralUserApp implements Serializable, Comparable { + + private static final long serialVersionUID = -1140858385803822099L; + private Long userId; + private CentralApp app; + private CentralRole role; + private Integer priority; + + @Override + public int compareTo(Object obj) { + String c1 = getRole().getName(); + String c2 = ((CentralUserApp) obj).getRole().getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2Role.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2Role.java new file mode 100644 index 00000000..25cc66fa --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2Role.java @@ -0,0 +1,102 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.Date; +import java.util.SortedSet; +import java.util.TreeSet; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class CentralV2Role implements Serializable, Comparable { + + private static final long serialVersionUID = -4332644961113063714L; + + private Long id; + private Date created; + private Date modified; + private Long createdId; + private Long modifiedId; + private Long rowNum; + private String name; + private boolean active; + private Integer priority; + private SortedSet roleFunctions = new TreeSet<>(); + private SortedSet childRoles = new TreeSet<>(); + private SortedSet parentRoles = new TreeSet<>(); + + public CentralV2Role(Long id, String name) { + this.id = id; + this.name = name; + } + + public void addRoleFunction(CentralV2RoleFunction roleFunction) { + this.roleFunctions.add(roleFunction); + } + + public void addChildRole(CentralV2Role role) { + this.childRoles.add(role); + } + + public void addParentRole(CentralV2Role role) { + this.parentRoles.add(role); + } + + @Override + public int compareTo(Object obj) { + CentralV2Role other = (CentralV2Role) obj; + + String c1 = getName(); + String c2 = other.getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java new file mode 100644 index 00000000..17f63823 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2RoleFunction.java @@ -0,0 +1,103 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.onap.portalsdk.core.domain.support.DomainVo; + +@Getter +@Setter +@EqualsAndHashCode() +@NoArgsConstructor +@AllArgsConstructor +public class CentralV2RoleFunction extends DomainVo implements Serializable, Comparable { + + private static final long serialVersionUID = -4018975640065252688L; + + private String code; + private String name; + private Long appId; + private Long roleId; + private String type; + private String action; + private String editUrl; + + public CentralV2RoleFunction(Long id, String code, String name, Long appId, String type, String action, + String editUrl) { + super(); + this.id = id; + this.code = code; + this.name = name; + this.appId = appId; + this.type = type; + this.action = action; + this.editUrl = editUrl; + } + + public CentralV2RoleFunction(Long id, String code, String name, Long appId, String editUrl) { + super(); + this.id = id; + this.code = code; + this.name = name; + this.appId = appId; + this.editUrl = editUrl; + } + + + public CentralV2RoleFunction(String code, String name) { + super(); + this.code = code; + this.name = name; + } + + public int compareTo(Object obj) { + String c1 = getName(); + String c2 = ((CentralV2RoleFunction) obj).getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2User.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2User.java new file mode 100644 index 00000000..79bcee1f --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2User.java @@ -0,0 +1,117 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.Date; +import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class CentralV2User implements Serializable { + + private static final long serialVersionUID = -2673289523184880563L; + + private Long id; + private Date created; + private Date modified; + private Long createdId; + private Long modifiedId; + private Long rowNum; + private Long orgId; + private Long managerId; + private String firstName; + private String middleInitial; + private String lastName; + private String phone; + private String fax; + private String cellular; + private String email; + private Long addressId; + private String alertMethodCd; + private String hrid; + private String orgUserId; + private String orgCode; + private String address1; + private String address2; + private String city; + private String state; + private String zipCode; + private String country; + private String orgManagerUserId; + private String locationClli; + private String businessCountryCode; + private String businessCountryName; + private String businessUnit; + private String businessUnitName; + private String department; + private String departmentName; + private String companyCode; + private String company; + private String zipCodeSuffix; + private String jobTitle; + private String commandChain; + private String siloStatus; + private String costCenter; + private String financialLocCode; + private String loginId; + private String loginPwd; + private Date lastLoginDate; + private boolean active; + private boolean internal; + private Long selectedProfileId; + private Long timeZoneId; + private boolean online; + private String chatId; + private Set userApps = null; + private Set pseudoRoles = null; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java new file mode 100644 index 00000000..69ff4a25 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java @@ -0,0 +1,72 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CentralV2UserApp implements Serializable, Comparable{ + + private static final long serialVersionUID = 4954830080839125389L; + + private Long userId; + private CentralApp app; + private CentralV2Role role; + private Integer priority; + + public int compareTo(Object other){ + CentralV2UserApp castOther = (CentralV2UserApp) other; + + Long c1 = (this.getUserId() == null ? 0 : this.getUserId()) + (this.priority == null ? 0 : this.priority); + Long c2 = (castOther.getUserId() == null ? 0 : castOther.getUserId()); + c2 += (castOther.getApp() == null || castOther.getApp().getId() == null ? 0 : castOther.getApp().getId()); + c2 += (castOther.priority == null ? 0 : castOther.priority); + + return c1.compareTo(c2); + } +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralizedAppRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralizedAppRoles.java new file mode 100644 index 00000000..46e3632e --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralizedAppRoles.java @@ -0,0 +1,62 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CentralizedAppRoles implements Serializable{ + + private static final long serialVersionUID = 6670280863269352495L; + + private Long appId; + private String appNameSpace; + private String roleName; + private Long roleId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java new file mode 100644 index 00000000..f06e517b --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidget.java @@ -0,0 +1,96 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import javax.persistence.Column; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.validator.constraints.SafeHtml; +import org.onap.portalsdk.core.domain.support.DomainVo; + + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class CommonWidget extends DomainVo{ + + private static final long serialVersionUID = 7897021982887364557L; + + private Long id; + @Size(max = 32) + @SafeHtml + private String category; + @Size(max = 512) + @SafeHtml + private String href; + @Size(max = 256) + @SafeHtml + private String title; + @Size(max = 4096) + @SafeHtml + private String content; + @Size(max = 10) + @Pattern(regexp = "([1-2][0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])") + @SafeHtml + private String eventDate; + @Column(name = "sort_order") + private Integer sortOrder; + + + public CommonWidget(String category, String href, String title, String content, String eventDate, Integer sortOrder){ + this.category = category; + this.href = href; + this.title = title; + this.content = content; + this.eventDate = eventDate; + this.sortOrder = sortOrder; + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidgetMeta.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidgetMeta.java new file mode 100644 index 00000000..e2884f70 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CommonWidgetMeta.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.List; +import javax.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.validator.constraints.SafeHtml; + + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class CommonWidgetMeta { + + @SafeHtml + private String category; + @Valid + private List items; +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsManualPreference.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsManualPreference.java new file mode 100644 index 00000000..399bd7e5 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsManualPreference.java @@ -0,0 +1,77 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EPAppsManualPreference { + + private Long appid; + private int col; + @SafeHtml + private String headerText; + @SafeHtml + private String imageLink; + private int order; + private boolean restrictedApp; + private int row; + private int sizeX; + private int sizeY; + @SafeHtml + private String subHeaderText; + @SafeHtml + private String url; + private boolean addRemoveApps; + + public boolean isValid(){ + return appid != null; + } +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsSortPreference.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsSortPreference.java new file mode 100644 index 00000000..38b96c92 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPAppsSortPreference.java @@ -0,0 +1,61 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class EPAppsSortPreference { + + private int index; + @SafeHtml + private String value; + @SafeHtml + private String title; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPDeleteAppsManualSortPref.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPDeleteAppsManualSortPref.java new file mode 100644 index 00000000..38fd218c --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPDeleteAppsManualSortPref.java @@ -0,0 +1,58 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class EPDeleteAppsManualSortPref { + + private Long appId; + private boolean select; + private boolean pending; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPUserAppCurrentRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPUserAppCurrentRoles.java new file mode 100644 index 00000000..249aee11 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPUserAppCurrentRoles.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class EPUserAppCurrentRoles implements Serializable{ + + private static final long serialVersionUID = -8145807875293949759L; + + private String roleName; + private Long userId; + private Integer priority ; + private Long roleId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPWidgetsSortPreference.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPWidgetsSortPreference.java new file mode 100644 index 00000000..0cb3a0a0 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EPWidgetsSortPreference.java @@ -0,0 +1,69 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class EPWidgetsSortPreference { + + private int sizeX; + private int sizeY; + @SafeHtml + private String headerText; + @SafeHtml + private String url; + private Long widgetid; + private List attrb; + @SafeHtml + private String widgetIdentifier; + private int row; + private int col; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserAppRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserAppRoles.java new file mode 100644 index 00000000..ebf8fe88 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserAppRoles.java @@ -0,0 +1,65 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class EcompUserAppRoles implements Serializable { + + private static final long serialVersionUID = -3394219387296578741L; + + private String appId; + private Long userId; + private Integer priority; + private Long roleId; + private String roleName; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserRoles.java new file mode 100644 index 00000000..d40abf5f --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EcompUserRoles.java @@ -0,0 +1,80 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class EcompUserRoles implements Serializable{ + + private static final long serialVersionUID = 1L; + + private Long orgId; + private String managerId; + private String firstName; + private String middleInitial; + private String lastName; + private String phone; + private String email; + private String hrid; + private String orgUserId; + private String orgCode; + private String orgManagerUserId; + private String jobTitle; + private String loginId; + private Long roleId; + private String roleName; + private boolean active; + private String functionCode; + private String functionName; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java new file mode 100644 index 00000000..2efc3dc2 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItem.java @@ -0,0 +1,102 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.Date; +import java.util.List; +import java.util.Set; +import javax.validation.constraints.Digits; +import javax.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.validator.constraints.SafeHtml; +import org.onap.portalsdk.core.domain.support.DomainVo; + +@Getter +@Setter +@Builder +@ToString +@EqualsAndHashCode() +@NoArgsConstructor +@AllArgsConstructor +public class EpNotificationItem extends DomainVo { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 11, fraction = 0) + private Long notificationId; + @Size(max = 1) + @SafeHtml + private String isForOnlineUsers; + @Size(max = 1) + @SafeHtml + private String isForAllRoles; + @Size(max = 1) + @SafeHtml + private String activeYn; + @Size(max = 100) + @SafeHtml + private String msgHeader; + @Size(max = 2000) + @SafeHtml + private String msgDescription; + @Size(max = 50) + @SafeHtml + private String msgSource; + private Date startTime; + private Date endTime; + @Digits(integer = 11, fraction = 0) + private Long priority; + @Digits(integer = 11, fraction = 0) + private Long creatorId; + private Date createdDate; + @Size(max = 512) + @SafeHtml + private String notificationHyperlink; + private Set roles; + private List roleIds; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemExtVO.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemExtVO.java new file mode 100644 index 00000000..d0eff3ff --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemExtVO.java @@ -0,0 +1,67 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class EpNotificationItemExtVO { + + private char activeYn; + private String msgHeader; + private String msgDescription; + private Date startTime; + private Date endTime; + private Integer priority; + private Integer creatorId; + private Date createdDate; + private String loginId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java new file mode 100644 index 00000000..6f36dd71 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpNotificationItemVO.java @@ -0,0 +1,82 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.onap.portalsdk.core.domain.support.DomainVo; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class EpNotificationItemVO extends DomainVo { + + private static final long serialVersionUID = 9095479701352339201L; + + private Integer notificationId; + private Character isForOnlineUsers; + private Character isForAllRoles; + private Character activeYn; + private String msgHeader; + private String msgDescription; + private String msgSource; + private Date startTime; + private Date endTime; + private Integer priority; + private Integer creatorId; + private Date createdDate; + private String loginId; + private String notificationHyperlink; + + public boolean isExpired() { + boolean result = false; + if (endTime != null) { + int expired = endTime.compareTo(new Date()); + result = expired < 0; + } + return result; + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java new file mode 100644 index 00000000..248ad732 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/EpRoleNotificationItem.java @@ -0,0 +1,67 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import javax.validation.constraints.Digits; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.onap.portalsdk.core.domain.support.DomainVo; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class EpRoleNotificationItem extends DomainVo { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 11, fraction = 0) + private Long id; + @Digits(integer = 11, fraction = 0) + private Long notificationId; + @Digits(integer = 11, fraction = 0) + private Integer roleId; + @Digits(integer = 11, fraction = 0) + private Integer RecvUserId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java new file mode 100644 index 00000000..e963fe47 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java @@ -0,0 +1,78 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalAccessPerms implements Serializable, Comparable{ + + private static final long serialVersionUID = -200964838466882602L; + + private String type; + private String instance; + private String action; + private String description; + + public ExternalAccessPerms(String type, String instance, String action) { + this.type = type; + this.instance = instance; + this.action = action; + } + + @Override + public int compareTo(Object obj){ + ExternalAccessPerms other = (ExternalAccessPerms)obj; + + String c1 = getInstance(); + String c2 = other.getInstance(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPermsDetail.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPermsDetail.java new file mode 100644 index 00000000..a53651ad --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPermsDetail.java @@ -0,0 +1,73 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonRootName; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonRootName(value = "perm") +public class ExternalAccessPermsDetail { + + private String type; + private String instance; + private String action; + private List roles; + private String description; + + public ExternalAccessPermsDetail(String type, String instance, String action, + String description) { + this.type = type; + this.instance = instance; + this.action = action; + this.description = description; + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRole.java new file mode 100644 index 00000000..9e4ad167 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRole.java @@ -0,0 +1,60 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalAccessRole implements Serializable { + + private static final long serialVersionUID = 3439986826362436339L; + + private String name; + private String description; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRolePerms.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRolePerms.java new file mode 100644 index 00000000..dd4429c3 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessRolePerms.java @@ -0,0 +1,57 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalAccessRolePerms { + + private ExternalAccessPerms perm; + private String role; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUser.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUser.java new file mode 100644 index 00000000..688a6e4b --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUser.java @@ -0,0 +1,57 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalAccessUser { + + private String user; + private String role; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUserRoleDetail.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUserRoleDetail.java new file mode 100644 index 00000000..ebea9b03 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessUserRoleDetail.java @@ -0,0 +1,59 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class ExternalAccessUserRoleDetail { + + private String name; + private ExternalRoleDescription description; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAuthUserRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAuthUserRole.java new file mode 100644 index 00000000..ee90285a --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAuthUserRole.java @@ -0,0 +1,61 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalAuthUserRole implements Serializable{ + + private static final long serialVersionUID = 5066251837431287376L; + + private String role; + private String user; + private String expiryDate; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRequestFieldsValidator.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRequestFieldsValidator.java new file mode 100644 index 00000000..9dc6d5e8 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRequestFieldsValidator.java @@ -0,0 +1,57 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalRequestFieldsValidator { + + private boolean result; + private String detailMessage; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRoleDescription.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRoleDescription.java new file mode 100644 index 00000000..b3e24ecd --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalRoleDescription.java @@ -0,0 +1,56 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ExternalRoleDescription { + + private String name; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItem.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItem.java new file mode 100644 index 00000000..74c78770 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItem.java @@ -0,0 +1,62 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import javax.validation.constraints.Digits; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class FavoritesFunctionalMenuItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 11, fraction = 0) + private Long userId; + @Digits(integer = 11, fraction = 0) + private Long menuId; +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItemJson.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItemJson.java new file mode 100644 index 00000000..8cf6f178 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FavoritesFunctionalMenuItemJson.java @@ -0,0 +1,65 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import javax.validation.constraints.Digits; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class FavoritesFunctionalMenuItemJson implements Serializable { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 11, fraction = 0) + private Long userId; + @Digits(integer = 11, fraction = 0) + private Long menuId; + private String text; + private String url; + private Boolean restrictedApp; +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FieldsValidator.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FieldsValidator.java new file mode 100644 index 00000000..d2bdd944 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FieldsValidator.java @@ -0,0 +1,72 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class FieldsValidator { + + private Long httpStatusCode = (long) HttpServletResponse.SC_OK; + private Long errorCode; + private List fields = new ArrayList<>(); + + @Getter + @Setter + @ToString + @NoArgsConstructor + @AllArgsConstructor + public class FieldName { + public String name; + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItem.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItem.java new file mode 100644 index 00000000..e3b1b9af --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItem.java @@ -0,0 +1,97 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Column; +import javax.validation.constraints.Digits; +import javax.validation.constraints.Max; +import javax.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class FunctionalMenuItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @Column(name = "MENU_ID") + @Digits(integer = 11, fraction = 0) + private Long menuId; + @Digits(integer = 2, fraction = 0) + @NotNull + private Integer column; + @Max(value = 100) + @SafeHtml + @NotNull + private String text; + @Digits(integer = 11, fraction = 0) + private Integer parentMenuId; + @Max(value = 128) + @SafeHtml + @NotNull + private String url; + @Max(value = 1) + @SafeHtml + @NotNull + private String active_yn; + private Integer appid; + private List roles; + private Boolean restrictedApp; + + public void normalize() { + if (this.column == null) { + this.column = 1; + } + this.text = (this.text == null) ? "" : this.text.trim(); + if (this.parentMenuId == null) { + this.parentMenuId = -1; + } + this.url = (this.url == null) ? "" : this.url.trim(); + } +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItemWithRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItemWithRoles.java new file mode 100644 index 00000000..0768de00 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuItemWithRoles.java @@ -0,0 +1,74 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class FunctionalMenuItemWithRoles implements Serializable { + private static final long serialVersionUID = 1L; + + private Long menuId; + private Integer column; + private String text; + private Integer parentMenuId; + private String url; + private Integer appid; + private List roles; + + public void normalize() { + if (this.column == null) + this.column = 1; + this.text = (this.text == null) ? "" : this.text.trim(); + if (this.parentMenuId == null) + this.parentMenuId = -1; + this.url = (this.url == null) ? "" : this.url.trim(); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuRole.java new file mode 100644 index 00000000..b0bd4ecb --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/FunctionalMenuRole.java @@ -0,0 +1,71 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import javax.validation.constraints.Digits; +import javax.validation.constraints.NotNull; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@EqualsAndHashCode +public class FunctionalMenuRole implements Serializable { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 11, fraction = 0) + public Integer id; + @Digits(integer = 11, fraction = 0) + @NotNull + public Long menuId; + @Digits(integer = 11, fraction = 0) + @NotNull + public Integer appId; + @Digits(integer = 11, fraction = 0) + @NotNull + public Integer roleId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/GlobalRoleWithApplicationRoleFunction.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/GlobalRoleWithApplicationRoleFunction.java new file mode 100644 index 00000000..c8b92f9d --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/GlobalRoleWithApplicationRoleFunction.java @@ -0,0 +1,68 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class GlobalRoleWithApplicationRoleFunction implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long roleId; + private String roleName; + private boolean active; + private Integer priority; + private String functionCd; + private String functionName; + private long appId; + private long roleAppId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/LocalRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/LocalRole.java new file mode 100644 index 00000000..424a2208 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/LocalRole.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class LocalRole implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer roleId; + private String rolename; + + public void normalize() { + this.rolename = (this.rolename == null) ? "" : this.rolename.trim(); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingApp.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingApp.java new file mode 100644 index 00000000..4d652020 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingApp.java @@ -0,0 +1,106 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OnboardingApp { + + private Long id; + @SafeHtml + private String name; + @SafeHtml + private String imageUrl; + @SafeHtml + private String imageLink; + @SafeHtml + private String description; + @SafeHtml + private String notes; + @SafeHtml + private String url; + @SafeHtml + private String alternateUrl; + @SafeHtml + private String restUrl; + private Boolean isOpen; + private Boolean isEnabled; + private Long motsId; + @SafeHtml + private String myLoginsAppName; + @SafeHtml + private String myLoginsAppOwner; + @SafeHtml + private String username; + @SafeHtml + private String appPassword; + @SafeHtml + private String thumbnail; + @SafeHtml + private String uebTopicName; + @SafeHtml + private String uebKey; + @SafeHtml + private String uebSecret; + private Boolean restrictedApp; + private Boolean isCentralAuth; + @SafeHtml + private String nameSpace; + + public void normalize() { + this.name = (this.name == null) ? "" : this.name.trim(); + this.myLoginsAppName = (this.myLoginsAppName == null) ? "" : this.myLoginsAppName.trim(); + this.myLoginsAppOwner = (this.myLoginsAppOwner == null) ? "" : this.myLoginsAppOwner.trim(); + this.username = (this.username == null) ? "" : this.username.trim(); + this.appPassword = (this.appPassword == null) ? "" : this.appPassword.trim(); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java new file mode 100644 index 00000000..e08d0339 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/OnboardingWidget.java @@ -0,0 +1,79 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class OnboardingWidget implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + @SafeHtml + private String name; + private Long appId; + @SafeHtml + private String appName; + private Integer width; + private Integer height; + @SafeHtml + private String url; + + public void normalize() { + this.name = (this.name == null) ? "" : this.name.trim(); + this.appName = (this.appName == null) ? "" : this.appName.trim(); + if (this.width == null) + this.width = 0; + if (this.height == null) + this.height = 0; + this.url = (this.url == null) ? "" : this.url.trim(); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdmin.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdmin.java new file mode 100644 index 00000000..c68f5a26 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdmin.java @@ -0,0 +1,72 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import javax.validation.constraints.Digits; +import javax.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.validator.constraints.SafeHtml; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class PortalAdmin implements Serializable { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 11, fraction = 0) + private Long userId; + @Size(max = 25) + @SafeHtml + private String loginId; + @Size(max = 50) + @SafeHtml + private String firstName; + @Size(max = 50) + @SafeHtml + private String lastName; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdminUserRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdminUserRole.java new file mode 100644 index 00000000..0d02273d --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/PortalAdminUserRole.java @@ -0,0 +1,65 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.io.Serializable; +import javax.validation.constraints.Digits; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class PortalAdminUserRole implements Serializable { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 10, fraction = 0) + private Long userId; + @Digits(integer = 10, fraction = 0) + private Long roleId; + @Digits(integer = 11, fraction = 0) + private Long appId; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/ProfileDetail.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java similarity index 71% rename from portal-BE/src/main/java/org/onap/portal/domain/dto/ProfileDetail.java rename to portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java index aec69a71..9024bddb 100644 --- a/portal-BE/src/main/java/org/onap/portal/domain/dto/ProfileDetail.java +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ProfileDetail.java @@ -1,8 +1,10 @@ -/*- +/* * ============LICENSE_START========================================== * ONAP Portal * =================================================================== - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -35,13 +37,14 @@ * * */ -package org.onap.portal.domain.dto; + +package org.onap.portal.domain.dto.transport; -import java.util.Objects; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -49,10 +52,12 @@ import lombok.ToString; @Setter @Getter +@ToString +@EqualsAndHashCode @NoArgsConstructor @AllArgsConstructor -@ToString public class ProfileDetail { + @NotBlank(message = "firstName must not be blank") private String firstName; @NotBlank(message = "lastName must not be blank") @@ -66,25 +71,4 @@ public class ProfileDetail { @NotBlank(message = "loginPassword must not be blank") private String loginPassword; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof ProfileDetail)) { - return false; - } - ProfileDetail that = (ProfileDetail) o; - return Objects.equals(firstName, that.firstName) && - Objects.equals(lastName, that.lastName) && - Objects.equals(middleName, that.middleName) && - Objects.equals(email, that.email) && - Objects.equals(loginId, that.loginId) && - Objects.equals(loginPassword, that.loginPassword); - } - - @Override - public int hashCode() { - return Objects.hash(firstName, lastName, middleName, email, loginId, loginPassword); - } } diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRole.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRole.java new file mode 100644 index 00000000..fdfeb25a --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRole.java @@ -0,0 +1,66 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class RemoteRole { + + private Long id; + private String name; + private Set roleFunctions; + + @Override + public String toString() { + return "RemoteRole [id=" + id + ", name=" + name + "]"; + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRoleV1.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRoleV1.java new file mode 100644 index 00000000..42d8f8a3 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteRoleV1.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class RemoteRoleV1 implements Comparable { + + private Long id; + private String name; + + @Override + public int compareTo(RemoteRoleV1 arg0) { + return this.id.compareTo(arg0.id); + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteUserWithRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteUserWithRoles.java new file mode 100644 index 00000000..2bbe019c --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RemoteUserWithRoles.java @@ -0,0 +1,76 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.ArrayList; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class RemoteUserWithRoles { + + private Long orgId; + private Long managerId; + private String firstName; + private String middleInitial; + private String lastName; + private String phone; + private String email; + private String hrid; + private String orgUserId; + private String orgCode; + private String orgManagerUserId; + private String jobTitle; + private String loginId; + private Boolean active; + private List roles = new ArrayList<>(); + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RoleInAppForUser.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RoleInAppForUser.java new file mode 100644 index 00000000..e4d1831d --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RoleInAppForUser.java @@ -0,0 +1,67 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +public class RoleInAppForUser { + + private Long roleId; + private String roleName; + private Boolean isApplied; + + public RoleInAppForUser(Long id, String name) { + this.roleId = id; + this.roleName = name; + } + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RolesInAppForUser.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RolesInAppForUser.java new file mode 100644 index 00000000..c70a86f6 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/RolesInAppForUser.java @@ -0,0 +1,60 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.ArrayList; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class RolesInAppForUser { + + private String orgUserId; + private Long appId; + private List roles = new ArrayList<>(); + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserApplicationRoles.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserApplicationRoles.java new file mode 100644 index 00000000..82770b0e --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserApplicationRoles.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import java.util.ArrayList; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class UserApplicationRoles { + + private Long appId; + private String orgUserId; + private String firstName; + private String lastName; + private List roles = new ArrayList<>(); + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserWithNameSurnameTitle.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserWithNameSurnameTitle.java new file mode 100644 index 00000000..e643dc92 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/UserWithNameSurnameTitle.java @@ -0,0 +1,61 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class UserWithNameSurnameTitle { + + private String orgUserId; + private String firstName; + private String lastName; + private String jobTitle; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/WidgetCatalogPersonalization.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/WidgetCatalogPersonalization.java new file mode 100644 index 00000000..b9e54bfc --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/WidgetCatalogPersonalization.java @@ -0,0 +1,57 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.domain.dto.transport; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class WidgetCatalogPersonalization { + + private Long widgetId; + private Boolean select; + +} diff --git a/portal-BE/src/main/java/org/onap/portal/logging/logic/EPLogUtil.java b/portal-BE/src/main/java/org/onap/portal/logging/logic/EPLogUtil.java index 9a3070c2..00de83de 100644 --- a/portal-BE/src/main/java/org/onap/portal/logging/logic/EPLogUtil.java +++ b/portal-BE/src/main/java/org/onap/portal/logging/logic/EPLogUtil.java @@ -173,7 +173,7 @@ public class EPLogUtil { */ private static String formatMessage(String message, Object... args) { StringBuilder sbFormattedMessage = new StringBuilder(); - if (args != null && args.length > 0 && message != null && message != "") { + if (args != null && args.length > 0 && message != null && !message.equals("")) { MessageFormat mf = new MessageFormat(message); sbFormattedMessage.append(mf.format(args)); } else { diff --git a/portal-BE/src/main/java/org/onap/portal/validation/DataValidator.java b/portal-BE/src/main/java/org/onap/portal/validation/DataValidator.java index 80ad9b70..3d7c61ec 100644 --- a/portal-BE/src/main/java/org/onap/portal/validation/DataValidator.java +++ b/portal-BE/src/main/java/org/onap/portal/validation/DataValidator.java @@ -46,7 +46,6 @@ import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; -import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; @Service diff --git a/portal-BE/src/main/resources/application.properties b/portal-BE/src/main/resources/application.properties index f3db0623..e31dcc30 100644 --- a/portal-BE/src/main/resources/application.properties +++ b/portal-BE/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8080 spring.datasource.url=jdbc:mysql://localhost:3306/testdb?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver spring.datasource.initialization-mode=always -spring.session.jdbc.initialize-schema: always +spring.session.jdbc.initialize-schema=always spring.datasource.continueOnError=true spring.datasource.username=root spring.datasource.password=root diff --git a/portal-BE/src/test/java/org/onap/portal/controller/UserControllerTest.java b/portal-BE/src/test/java/org/onap/portal/controller/UserControllerTest.java index e3f1f7be..7b420702 100644 --- a/portal-BE/src/test/java/org/onap/portal/controller/UserControllerTest.java +++ b/portal-BE/src/test/java/org/onap/portal/controller/UserControllerTest.java @@ -46,10 +46,9 @@ import org.junit.runner.RunWith; import org.onap.portal.domain.db.fn.FnUser; import org.onap.portal.domain.dto.PortalRestResponse; import org.onap.portal.domain.dto.PortalRestStatusEnum; -import org.onap.portal.domain.dto.ProfileDetail; +import org.onap.portal.domain.dto.transport.ProfileDetail; import org.onap.portal.service.fn.FnUserService; import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; -import org.onap.portalsdk.core.onboarding.util.CipherUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java b/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java index 26731eac..cc32f756 100644 --- a/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java +++ b/portal-BE/src/test/java/org/onap/portal/service/fn/FnUserServiceTest.java @@ -45,7 +45,6 @@ import static org.junit.jupiter.api.Assertions.*; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; -- 2.16.6