From a7c70290c4210cccd34e49d62cbb0d8779c9784f Mon Sep 17 00:00:00 2001 From: tosmers Date: Thu, 7 Sep 2017 09:22:08 +0000 Subject: [PATCH] [CCM][UPDATE] - adds import functionality of Permission and WorkflowTemplate - import of workflows still buggy... - optimizes imports git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4989 8810af33-2d31-482b-a856-94f89814c4df --- .../java/org/libreccm/admin/ui/AdminView.java | 12 +--- .../admin/ui/ConfigurationSettingsWindow.java | 10 +-- .../admin/ui/ConfigurationsTabController.java | 4 +- .../ui/ConfigurationsTableDataProvider.java | 4 +- .../admin/ui/ConfirmDiscardDialog.java | 8 +-- .../org/libreccm/admin/ui/GroupDetails.java | 22 +------ .../org/libreccm/admin/ui/GroupEditor.java | 12 +--- .../admin/ui/GroupMembersController.java | 9 +-- .../ui/GroupMembersTableDataProvider.java | 5 +- .../admin/ui/GroupRolesController.java | 9 +-- .../admin/ui/GroupRolesTableDataProvider.java | 5 +- .../admin/ui/GroupSelectorDataProvider.java | 5 +- .../org/libreccm/admin/ui/GroupsTable.java | 11 +--- .../admin/ui/GroupsTableDataProvider.java | 3 +- .../java/org/libreccm/admin/ui/Header.java | 6 +- .../org/libreccm/admin/ui/JpqlConsole.java | 29 ++------- .../admin/ui/JpqlConsoleController.java | 5 +- .../java/org/libreccm/admin/ui/LoginView.java | 1 - .../org/libreccm/admin/ui/PartySelector.java | 7 +-- .../admin/ui/PartySelectorDataProvider.java | 5 +- .../org/libreccm/admin/ui/RoleDetails.java | 17 +---- .../org/libreccm/admin/ui/RoleEditor.java | 11 +--- .../admin/ui/RolePartiesController.java | 9 +-- .../admin/ui/RolePartiesDataProvider.java | 5 +- .../org/libreccm/admin/ui/RoleSelector.java | 1 - .../admin/ui/RoleSelectorDataProvider.java | 7 +-- .../org/libreccm/admin/ui/RolesTable.java | 10 +-- .../admin/ui/RolesTableDataProvider.java | 3 +- .../org/libreccm/admin/ui/UserDetails.java | 19 +----- .../org/libreccm/admin/ui/UserEditor.java | 17 +---- .../admin/ui/UserGroupsController.java | 9 +-- .../admin/ui/UserGroupsTableDataProvider.java | 5 +- .../admin/ui/UserRolesController.java | 9 +-- .../admin/ui/UserRolesTableDataProvider.java | 5 +- .../org/libreccm/admin/ui/UserSelector.java | 7 +-- .../admin/ui/UserSelectorDataProvider.java | 5 +- .../admin/ui/UsersGroupsRolesTab.java | 1 - .../org/libreccm/admin/ui/UsersTable.java | 8 +-- .../admin/ui/UsersTableDataProvider.java | 3 +- .../AbstractAuditedEntityRepository.java | 1 - .../org/libreccm/auditing/CcmRevision.java | 7 +-- .../auditing/CcmRevisionListener.java | 1 - .../categorization/CategoryIdResolver.java | 4 +- .../categorization/DomainIdResolver.java | 3 + .../java/org/libreccm/cdi/utils/CdiUtil.java | 5 +- .../configuration/AbstractSetting.java | 21 ++----- .../configuration/BigDecimalSetting.java | 4 +- .../configuration/BooleanSetting.java | 2 +- .../configuration/ConfigurationInfo.java | 8 +-- .../configuration/ConfigurationManager.java | 20 ++---- .../libreccm/configuration/DoubleSetting.java | 5 +- .../libreccm/configuration/EnumSetting.java | 15 +---- .../configuration/ExampleConfiguration.java | 8 +-- .../configuration/LocalizedStringSetting.java | 9 +-- .../libreccm/configuration/LongSetting.java | 3 +- .../configuration/SettingConverter.java | 3 +- .../configuration/SettingManager.java | 16 +++-- .../configuration/StringListSetting.java | 9 +-- .../libreccm/configuration/StringSetting.java | 5 +- .../libreccm/core/CcmObjectIdResolver.java | 17 +++-- .../org/libreccm/core/ResourceIdResolver.java | 7 ++- .../libreccm/core/ResourceTypeIdResolver.java | 3 + .../java/org/libreccm/files/CcmFiles.java | 7 +-- .../libreccm/files/NIOFileSystemAdapter.java | 18 ++---- .../org/libreccm/formbuilder/Component.java | 14 +---- .../formbuilder/DataDrivenSelect.java | 9 ++- .../org/libreccm/formbuilder/FormSection.java | 11 ++-- .../org/libreccm/formbuilder/Listener.java | 9 ++- .../org/libreccm/formbuilder/MetaObject.java | 9 ++- .../org/libreccm/formbuilder/ObjectType.java | 9 ++- .../java/org/libreccm/formbuilder/Option.java | 10 +-- .../formbuilder/PersistentDataQuery.java | 11 +--- .../libreccm/formbuilder/ProcessListener.java | 12 +--- .../java/org/libreccm/formbuilder/Widget.java | 12 ++-- .../actions/ConfirmEmailListener.java | 9 ++- .../actions/ConfirmRedirectListener.java | 9 ++- .../actions/RemoteServerPostListener.java | 14 ++--- .../actions/SimpleEmailListener.java | 10 ++- .../actions/TemplateEmailListener.java | 9 ++- .../formbuilder/actions/XmlEmailListener.java | 9 ++- .../org/libreccm/jpa/AuditReaderProducer.java | 2 +- .../org/libreccm/jpa/utils/UriConverter.java | 4 +- .../org/libreccm/messaging/Attachment.java | 16 +---- .../java/org/libreccm/messaging/Message.java | 17 +---- .../org/libreccm/messaging/MessageThread.java | 9 ++- .../org/libreccm/modules/CcmIntegrator.java | 9 +-- .../modules/CcmModuleContextListener.java | 6 +- .../libreccm/modules/ConfigurationLoader.java | 15 +---- .../modules/DependencyTreeManager.java | 10 +-- .../org/libreccm/modules/InstalledModule.java | 7 +-- .../java/org/libreccm/modules/Module.java | 6 +- .../java/org/libreccm/modules/ModuleInfo.java | 6 +- .../org/libreccm/modules/ModuleManager.java | 15 ++--- .../org/libreccm/notification/Digest.java | 12 +--- .../libreccm/notification/Notification.java | 12 +--- .../org/libreccm/notification/QueueItem.java | 12 +--- .../pagemodel/AbstractPageBuilder.java | 2 +- .../pagemodel/ComponentBuilderManager.java | 9 +-- .../libreccm/pagemodel/ComponentModel.java | 14 +---- .../pagemodel/ComponentModelRepository.java | 3 +- .../pagemodel/ComponentModelType.java | 3 +- .../pagemodel/PageBuilderManager.java | 5 +- .../org/libreccm/pagemodel/PageModel.java | 22 +------ .../libreccm/pagemodel/PageModelManager.java | 22 +++---- .../pagemodel/PageModelRepository.java | 7 +-- .../org/libreccm/pagemodel/PageModelType.java | 3 +- .../pagemodel/ui/ApplicationTreeNode.java | 3 +- .../libreccm/pagemodel/ui/PageModelPane.java | 1 - .../pagemodel/ui/PageModelTreeController.java | 5 +- .../pagemodel/ui/PageModelTreeNode.java | 3 +- .../libreccm/pagemodel/ui/PageTreeModel.java | 5 +- .../main/java/org/libreccm/portal/Portal.java | 13 ++-- .../java/org/libreccm/portal/Portlet.java | 9 +-- .../java/org/libreccm/runtime/Initalizer.java | 13 +--- .../org/libreccm/search/SearchManager.java | 5 +- .../org/libreccm/search/lucene/Document.java | 15 +---- .../org/libreccm/search/lucene/Index.java | 12 +--- .../libreccm/security/GroupIdResolver.java | 4 +- .../libreccm/security/PartyIdResolver.java | 4 +- .../security/PermissionIdGenerator.java | 4 +- .../security/PermissionIdResolver.java | 41 ++++++------ .../security/PermissionRepository.java | 2 +- .../org/libreccm/security/RoleIdResolver.java | 4 +- .../security/RoleMembershipMarshaller.java | 21 ------- .../org/libreccm/security/UserIdResolver.java | 5 +- .../libreccm/themes/StaticThemesServlet.java | 9 ++- .../ui/admin/AuthorizationListener.java | 19 +++--- .../ui/admin/UserContextController.java | 7 +-- .../ui/admin/sysinfo/SysInfoController.java | 15 ++--- .../usersgroupsroles/RolesController.java | 12 ++-- ...solver.java => ApplicationIdResolver.java} | 9 ++- ...haller.java => ApplicationMarshaller.java} | 2 +- .../java/org/libreccm/web/CcmApplication.java | 2 +- .../workflow/AssignableTaskIdResolver.java | 17 +++-- .../workflow/TaskAssignmentIdGenerator.java | 2 +- .../org/libreccm/workflow/TaskIdResolver.java | 17 +++-- .../libreccm/workflow/WorkflowIdResolver.java | 17 +++-- .../libreccm/workflow/WorkflowTemplate.java | 17 ++++- .../workflow/WorkflowTemplateIdResolver.java | 62 +++++++++++++++++++ .../workflow/WorkflowTemplateRepository.java | 29 +++++++++ .../portation/CoreDataImportTest.java | 16 +++-- .../org/libreccm/portation/ImportHelper.java | 26 ++++---- 142 files changed, 527 insertions(+), 858 deletions(-) rename ccm-core/src/main/java/org/libreccm/web/{CcmApplicationIdResolver.java => ApplicationIdResolver.java} (89%) rename ccm-core/src/main/java/org/libreccm/web/{CcmApplicationMarshaller.java => ApplicationMarshaller.java} (94%) create mode 100644 ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateIdResolver.java diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/AdminView.java b/ccm-core/src/main/java/org/libreccm/admin/ui/AdminView.java index e76360b7d..77c05d436 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/AdminView.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/AdminView.java @@ -19,7 +19,6 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.cdi.CDIView; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; @@ -30,19 +29,12 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import org.apache.shiro.subject.Subject; import org.libreccm.l10n.GlobalizationHelper; -import org.libreccm.security.GroupManager; -import org.libreccm.security.GroupRepository; -import org.libreccm.security.PermissionChecker; -import org.libreccm.security.RoleManager; -import org.libreccm.security.RoleRepository; -import org.libreccm.security.UserManager; -import org.libreccm.security.UserRepository; - -import java.util.ResourceBundle; +import org.libreccm.security.*; import javax.annotation.PostConstruct; import javax.inject.Inject; import javax.servlet.ServletContext; +import java.util.ResourceBundle; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationSettingsWindow.java b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationSettingsWindow.java index 528b7a5db..9197d6452 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationSettingsWindow.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationSettingsWindow.java @@ -21,15 +21,7 @@ package org.libreccm.admin.ui; import com.vaadin.data.provider.CallbackDataProvider; import com.vaadin.data.provider.Query; import com.vaadin.server.UserError; -import com.vaadin.ui.Button; -import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Component; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.TextField; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import org.libreccm.configuration.ConfigurationInfo; import org.libreccm.configuration.SettingInfo; import org.libreccm.core.UnexpectedErrorException; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTabController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTabController.java index 1dbc07c0d..9f676565f 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTabController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTabController.java @@ -19,15 +19,13 @@ package org.libreccm.admin.ui; import com.arsdigita.kernel.KernelConfig; - import com.vaadin.cdi.ViewScoped; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.configuration.SettingManager; import org.libreccm.l10n.GlobalizationHelper; -import java.util.Locale; - import javax.inject.Inject; +import java.util.Locale; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTableDataProvider.java index db97e0789..16987e443 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfigurationsTableDataProvider.java @@ -19,7 +19,6 @@ package org.libreccm.admin.ui; import com.arsdigita.kernel.KernelConfig; - import com.vaadin.cdi.ViewScoped; import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; @@ -27,12 +26,11 @@ import org.libreccm.configuration.ConfigurationInfo; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.l10n.GlobalizationHelper; +import javax.inject.Inject; import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; - /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfirmDiscardDialog.java b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfirmDiscardDialog.java index b6f145156..dd639d467 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/ConfirmDiscardDialog.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/ConfirmDiscardDialog.java @@ -19,13 +19,7 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - -import com.vaadin.ui.Button; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import java.util.ResourceBundle; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupDetails.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupDetails.java index 78ea5e375..f75db64f3 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupDetails.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupDetails.java @@ -19,35 +19,17 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.data.HasValue; import com.vaadin.icons.VaadinIcons; import com.vaadin.server.Page; import com.vaadin.server.UserError; -import com.vaadin.ui.Button; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Panel; -import com.vaadin.ui.TabSheet; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.themes.ValoTheme; -import org.libreccm.admin.ui.ConfirmDiscardDialog; import org.libreccm.cdi.utils.CdiUtil; -import org.libreccm.security.Group; -import org.libreccm.security.GroupRepository; -import org.libreccm.security.Role; -import org.libreccm.security.RoleRepository; -import org.libreccm.security.User; -import org.libreccm.security.UserRepository; +import org.libreccm.security.*; import java.util.ResourceBundle; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupEditor.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupEditor.java index 0c9d9acfe..7896eeac1 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupEditor.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupEditor.java @@ -19,20 +19,10 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.data.HasValue; import com.vaadin.server.Page; import com.vaadin.server.UserError; -import com.vaadin.ui.Button; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Panel; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import org.libreccm.admin.ui.ConfirmDiscardDialog; +import com.vaadin.ui.*; import org.libreccm.security.Group; import org.libreccm.security.GroupManager; import org.libreccm.security.GroupRepository; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersController.java index 4edd45627..2fc0d6498 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersController.java @@ -18,17 +18,12 @@ */ package org.libreccm.admin.ui; -import org.libreccm.security.Group; -import org.libreccm.security.GroupManager; -import org.libreccm.security.GroupRepository; -import org.libreccm.security.User; -import org.libreccm.security.UserRepository; - -import java.util.Set; +import org.libreccm.security.*; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersTableDataProvider.java index 7b30f3dc5..600ecf95c 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupMembersTableDataProvider.java @@ -25,9 +25,6 @@ import org.libreccm.security.Group; import org.libreccm.security.GroupMembership; import org.libreccm.security.User; -import java.util.Objects; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; @@ -35,6 +32,8 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.Objects; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesController.java index c5d5f2d29..058871ec4 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesController.java @@ -18,17 +18,12 @@ */ package org.libreccm.admin.ui; -import org.libreccm.security.Group; -import org.libreccm.security.GroupRepository; -import org.libreccm.security.Role; -import org.libreccm.security.RoleManager; -import org.libreccm.security.RoleRepository; - -import java.util.Set; +import org.libreccm.security.*; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesTableDataProvider.java index eb1e5c8f8..b1c1143c1 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupRolesTableDataProvider.java @@ -25,9 +25,6 @@ import org.libreccm.security.Group; import org.libreccm.security.Role; import org.libreccm.security.RoleMembership; -import java.util.Objects; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; @@ -35,6 +32,8 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.Objects; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupSelectorDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupSelectorDataProvider.java index ae40d4c64..9fb2779c3 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupSelectorDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupSelectorDataProvider.java @@ -23,15 +23,14 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.Group; -import java.util.List; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.List; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTable.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTable.java index d7435e0f1..6e3cd99ad 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTable.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTable.java @@ -19,21 +19,12 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.themes.ValoTheme; -import org.libreccm.admin.ui.AdminView; import org.libreccm.security.Group; import org.libreccm.security.GroupRepository; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTableDataProvider.java index 43d90e6af..4acec65fc 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/GroupsTableDataProvider.java @@ -23,14 +23,13 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.Group; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/Header.java b/ccm-core/src/main/java/org/libreccm/admin/ui/Header.java index b8ce300cb..b2118df6c 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/Header.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/Header.java @@ -7,11 +7,7 @@ package org.libreccm.admin.ui; import com.vaadin.server.ClassResource; import com.vaadin.server.VaadinServlet; -import com.vaadin.ui.Alignment; -import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Image; -import com.vaadin.ui.Label; +import com.vaadin.ui.*; import javax.servlet.ServletContext; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java b/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java index e0cd5a447..bc601874d 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsole.java @@ -19,25 +19,15 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.data.HasValue; import com.vaadin.data.ValueProvider; import com.vaadin.server.UserError; -import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.Button; -import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.Notification; -import com.vaadin.ui.Panel; -import com.vaadin.ui.TextArea; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.persistence.Id; +import javax.persistence.PersistenceException; import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -45,20 +35,9 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.ResourceBundle; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; -import javax.persistence.Id; -import javax.persistence.PersistenceException; - /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsoleController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsoleController.java index 3c2f581dc..1b4d1d536 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsoleController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/JpqlConsoleController.java @@ -18,14 +18,13 @@ */ package org.libreccm.admin.ui; -import java.util.List; -import java.util.Objects; - import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.Query; import javax.transaction.Transactional; +import java.util.List; +import java.util.Objects; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java b/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java index 001eede83..68409a248 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/LoginView.java @@ -18,7 +18,6 @@ */ package org.libreccm.admin.ui; - import com.vaadin.cdi.CDIView; import org.libreccm.ui.AbstractLoginView; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelector.java b/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelector.java index 6d05d3820..d27dbf789 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelector.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelector.java @@ -19,13 +19,8 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.UI; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.themes.ValoTheme; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelectorDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelectorDataProvider.java index 0ca7379b1..05408fb4a 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelectorDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/PartySelectorDataProvider.java @@ -23,15 +23,14 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.Party; -import java.util.List; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.List; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleDetails.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleDetails.java index a8b55877e..ff92e2e66 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleDetails.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleDetails.java @@ -19,27 +19,14 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.themes.ValoTheme; import org.libreccm.cdi.utils.CdiUtil; -import org.libreccm.security.Party; -import org.libreccm.security.PartyRepository; -import org.libreccm.security.Role; -import org.libreccm.security.RoleManager; -import org.libreccm.security.RoleRepository; +import org.libreccm.security.*; import java.util.ResourceBundle; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleEditor.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleEditor.java index 07fc1f321..7a9a08887 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleEditor.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleEditor.java @@ -19,18 +19,9 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.data.HasValue; import com.vaadin.server.UserError; -import com.vaadin.ui.Button; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.TextArea; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import org.libreccm.admin.ui.ConfirmDiscardDialog; +import com.vaadin.ui.*; import org.libreccm.security.Role; import org.libreccm.security.RoleManager; import org.libreccm.security.RoleRepository; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesController.java index 75f7a00ce..3e2dd60dc 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesController.java @@ -18,17 +18,12 @@ */ package org.libreccm.admin.ui; -import org.libreccm.security.Party; -import org.libreccm.security.PartyRepository; -import org.libreccm.security.Role; -import org.libreccm.security.RoleManager; -import org.libreccm.security.RoleRepository; - -import java.util.Set; +import org.libreccm.security.*; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesDataProvider.java index 177e3ac30..9c01dd95d 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RolePartiesDataProvider.java @@ -25,15 +25,14 @@ import org.libreccm.security.Party; import org.libreccm.security.Role; import org.libreccm.security.RoleMembership; -import java.util.Objects; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; +import java.util.Objects; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelector.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelector.java index c21f4e0d4..d8b2db47a 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelector.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelector.java @@ -20,7 +20,6 @@ package org.libreccm.admin.ui; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.Button; - import com.vaadin.ui.Grid; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Window; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelectorDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelectorDataProvider.java index 97f6bffae..d722e3706 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelectorDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RoleSelectorDataProvider.java @@ -23,16 +23,15 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.Role; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTable.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTable.java index c9e09c2bf..79347083b 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTable.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTable.java @@ -19,16 +19,8 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.renderers.ButtonRenderer; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTableDataProvider.java index e97790709..d473d0f5e 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/RolesTableDataProvider.java @@ -23,14 +23,13 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.Role; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserDetails.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserDetails.java index 92b243b6f..ee8931132 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserDetails.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserDetails.java @@ -19,29 +19,14 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.TabSheet; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.themes.ValoTheme; import org.libreccm.cdi.utils.CdiUtil; -import org.libreccm.security.Group; -import org.libreccm.security.GroupRepository; -import org.libreccm.security.Role; -import org.libreccm.security.RoleRepository; -import org.libreccm.security.User; -import org.libreccm.security.UserManager; -import org.libreccm.security.UserRepository; +import org.libreccm.security.*; import java.util.ResourceBundle; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserEditor.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserEditor.java index fce4ae8e0..312f98718 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserEditor.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserEditor.java @@ -19,25 +19,13 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.data.HasValue; import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import com.vaadin.server.UserError; -import com.vaadin.ui.Button; -import com.vaadin.ui.CheckBox; -import com.vaadin.ui.FormLayout; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Panel; -import com.vaadin.ui.PasswordField; -import com.vaadin.ui.RadioButtonGroup; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.libreccm.admin.ui.ConfirmDiscardDialog; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.core.EmailAddress; import org.libreccm.core.UnexpectedErrorException; @@ -46,13 +34,12 @@ import org.libreccm.security.User; import org.libreccm.security.UserManager; import org.libreccm.security.UserRepository; +import javax.mail.MessagingException; import java.util.Arrays; import java.util.ResourceBundle; import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.mail.MessagingException; - /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsController.java index d07c92bb8..4822869c6 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsController.java @@ -18,17 +18,12 @@ */ package org.libreccm.admin.ui; -import org.libreccm.security.Group; -import org.libreccm.security.GroupManager; -import org.libreccm.security.GroupRepository; -import org.libreccm.security.User; -import org.libreccm.security.UserRepository; - -import java.util.Set; +import org.libreccm.security.*; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsTableDataProvider.java index 761b10d27..e1e72a9b0 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserGroupsTableDataProvider.java @@ -25,9 +25,6 @@ import org.libreccm.security.Group; import org.libreccm.security.GroupMembership; import org.libreccm.security.User; -import java.util.Objects; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; @@ -35,6 +32,8 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.Objects; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesController.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesController.java index 247523ade..84aa0a700 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesController.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesController.java @@ -18,17 +18,12 @@ */ package org.libreccm.admin.ui; -import org.libreccm.security.Role; -import org.libreccm.security.RoleManager; -import org.libreccm.security.RoleRepository; -import org.libreccm.security.User; -import org.libreccm.security.UserRepository; - -import java.util.Set; +import org.libreccm.security.*; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesTableDataProvider.java index af8e3e21b..6047f36c5 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserRolesTableDataProvider.java @@ -25,9 +25,6 @@ import org.libreccm.security.Role; import org.libreccm.security.RoleMembership; import org.libreccm.security.User; -import java.util.Objects; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; @@ -35,6 +32,8 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.Objects; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelector.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelector.java index 62c7b0cf2..5999ba394 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelector.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelector.java @@ -19,13 +19,8 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.UI; -import com.vaadin.ui.Window; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.themes.ValoTheme; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelectorDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelectorDataProvider.java index c84341951..0bfb47d07 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelectorDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UserSelectorDataProvider.java @@ -23,15 +23,14 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.User; -import java.util.List; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.List; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UsersGroupsRolesTab.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UsersGroupsRolesTab.java index 02babf368..c0e36f8ce 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UsersGroupsRolesTab.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UsersGroupsRolesTab.java @@ -19,7 +19,6 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.ui.CustomComponent; import com.vaadin.ui.TabSheet; import com.vaadin.ui.UI; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTable.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTable.java index 7f6d8aae8..f84616e93 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTable.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTable.java @@ -19,18 +19,12 @@ package org.libreccm.admin.ui; import com.arsdigita.ui.admin.AdminUiConstants; - import com.vaadin.icons.VaadinIcons; -import com.vaadin.ui.Button; -import com.vaadin.ui.Grid; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.TextField; -import com.vaadin.ui.UI; +import com.vaadin.ui.*; import com.vaadin.ui.components.grid.HeaderCell; import com.vaadin.ui.components.grid.HeaderRow; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.themes.ValoTheme; -import org.libreccm.admin.ui.AdminView; import org.libreccm.security.User; import java.util.ResourceBundle; diff --git a/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTableDataProvider.java b/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTableDataProvider.java index 759be9817..f47e76435 100644 --- a/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTableDataProvider.java +++ b/ccm-core/src/main/java/org/libreccm/admin/ui/UsersTableDataProvider.java @@ -23,14 +23,13 @@ import com.vaadin.data.provider.AbstractDataProvider; import com.vaadin.data.provider.Query; import org.libreccm.security.User; -import java.util.stream.Stream; - import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.transaction.Transactional; +import java.util.stream.Stream; /** * diff --git a/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java b/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java index 2dd9b842f..41be993b5 100644 --- a/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java +++ b/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java @@ -25,7 +25,6 @@ import org.hibernate.envers.query.AuditQuery; import org.libreccm.core.AbstractEntityRepository; import javax.inject.Inject; - import java.util.List; import java.util.stream.Collectors; diff --git a/ccm-core/src/main/java/org/libreccm/auditing/CcmRevision.java b/ccm-core/src/main/java/org/libreccm/auditing/CcmRevision.java index e08580198..6751765cd 100644 --- a/ccm-core/src/main/java/org/libreccm/auditing/CcmRevision.java +++ b/ccm-core/src/main/java/org/libreccm/auditing/CcmRevision.java @@ -21,13 +21,12 @@ package org.libreccm.auditing; import org.hibernate.envers.DefaultRevisionEntity; import org.hibernate.envers.RevisionEntity; -import static org.libreccm.core.CoreConstants.*; - -import java.util.Objects; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * Revision entity for Hibernate Envers containing the editing user. We are not diff --git a/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java b/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java index caea4d17b..15e45c71d 100644 --- a/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java +++ b/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java @@ -19,7 +19,6 @@ package org.libreccm.auditing; import org.apache.shiro.subject.Subject; - import org.hibernate.envers.RevisionListener; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.Shiro; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java index 24d0868b3..3583b8f6c 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java @@ -22,12 +22,14 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; +import javax.enterprise.context.RequestScoped; + /** * @author Tobias Osmers<\a> * @version created the 8/2/17 */ +@RequestScoped public class DomainIdResolver implements ObjectIdResolver { @Override public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { diff --git a/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java b/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java index 6d6c40746..03bd7315c 100644 --- a/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java +++ b/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java @@ -22,14 +22,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import java.util.Iterator; -import java.util.Set; - import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import javax.naming.NamingException; +import java.util.Iterator; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java index 02930a6e3..7c4d1355d 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java @@ -18,23 +18,14 @@ */ package org.libreccm.configuration; -import java.io.Serializable; -import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.Pattern; import org.hibernate.validator.constraints.NotBlank; -import static org.libreccm.core.CoreConstants.*; +import javax.persistence.*; +import javax.validation.constraints.Pattern; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * Abstract base class for all settings. diff --git a/ccm-core/src/main/java/org/libreccm/configuration/BigDecimalSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/BigDecimalSetting.java index c2af2c044..a8cd15a55 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/BigDecimalSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/BigDecimalSetting.java @@ -18,11 +18,11 @@ */ package org.libreccm.configuration; +import javax.persistence.Column; +import javax.persistence.Entity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; /** * Setting for values of type {@link BigDecimal}. Use this for rational numbers diff --git a/ccm-core/src/main/java/org/libreccm/configuration/BooleanSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/BooleanSetting.java index d14e7c742..6d263bd12 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/BooleanSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/BooleanSetting.java @@ -18,9 +18,9 @@ */ package org.libreccm.configuration; -import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; +import java.io.Serializable; /** * Setting of boolean values. diff --git a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java index 54e8ae198..1cd59e094 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java @@ -21,13 +21,7 @@ package org.libreccm.configuration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.Collections; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.NavigableMap; -import java.util.Objects; -import java.util.ResourceBundle; -import java.util.TreeMap; +import java.util.*; /** * Describes a configuration. Useful for generating user interfaces. diff --git a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java index 4c4a33787..aba86b151 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java @@ -18,14 +18,8 @@ */ package org.libreccm.configuration; -import java.lang.reflect.Field; - -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.util.Strings; import org.libreccm.core.CoreConstants; import org.libreccm.modules.CcmModule; @@ -33,13 +27,11 @@ import org.libreccm.modules.Module; import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.SortedSet; -import java.util.TreeSet; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.transaction.Transactional; +import java.lang.reflect.Field; +import java.util.*; import java.util.stream.Collectors; /** diff --git a/ccm-core/src/main/java/org/libreccm/configuration/DoubleSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/DoubleSetting.java index ac883186f..c5488a2c1 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/DoubleSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/DoubleSetting.java @@ -18,11 +18,10 @@ */ package org.libreccm.configuration; -import java.io.Serializable; -import java.math.BigDecimal; - import javax.persistence.Column; import javax.persistence.Entity; +import java.io.Serializable; +import java.math.BigDecimal; /** * Setting for values for type double (rational numbers). Be aware: Because how diff --git a/ccm-core/src/main/java/org/libreccm/configuration/EnumSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/EnumSetting.java index e0ccacce9..1f4bacd7f 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/EnumSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/EnumSetting.java @@ -18,20 +18,11 @@ */ package org.libreccm.configuration; -import static org.libreccm.core.CoreConstants.*; - +import javax.persistence.*; import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.Objects; +import java.util.*; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * A setting class for storing a set of strings. This can be used to generate diff --git a/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java b/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java index 42989c244..966697b28 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java @@ -21,13 +21,7 @@ package org.libreccm.configuration; import org.libreccm.l10n.LocalizedString; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.Objects; -import java.util.Set; +import java.util.*; /** * Example of configuration with all available setting types. Not used anywhere diff --git a/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java index ca3bd399a..0851cf5fa 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/LocalizedStringSetting.java @@ -18,18 +18,13 @@ */ package org.libreccm.configuration; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.l10n.LocalizedString; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.AssociationOverride; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * A setting which stores a {@link LocalizedString} . This can be used for diff --git a/ccm-core/src/main/java/org/libreccm/configuration/LongSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/LongSetting.java index c2047dd6c..19e744545 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/LongSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/LongSetting.java @@ -19,10 +19,9 @@ package org.libreccm.configuration; -import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; +import java.io.Serializable; /** * Setting for storing a long value. diff --git a/ccm-core/src/main/java/org/libreccm/configuration/SettingConverter.java b/ccm-core/src/main/java/org/libreccm/configuration/SettingConverter.java index 1c9f7109c..002b6d292 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/SettingConverter.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/SettingConverter.java @@ -22,14 +22,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.libreccm.l10n.LocalizedString; +import javax.enterprise.context.RequestScoped; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javax.enterprise.context.RequestScoped; - /** * Helper class for converting values to settings of the appropriate type. * diff --git a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java index 61d182d30..a237ed80a 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java @@ -18,15 +18,6 @@ */ package org.libreccm.configuration; -import java.lang.reflect.Field; -import java.util.List; - -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.util.Strings; @@ -34,7 +25,14 @@ import org.libreccm.core.CoreConstants; import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import javax.transaction.Transactional; +import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.List; import java.util.Objects; /** diff --git a/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java index 6256b06fc..773a1f51a 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java @@ -18,17 +18,12 @@ */ package org.libreccm.configuration; -import static org.libreccm.core.CoreConstants.*; - +import javax.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * Setting for a list of strings. In contrast to the {@link EnumSetting} which diff --git a/ccm-core/src/main/java/org/libreccm/configuration/StringSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/StringSetting.java index 558e212e7..e5b17f250 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/StringSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/StringSetting.java @@ -19,11 +19,10 @@ package org.libreccm.configuration; -import java.io.Serializable; -import java.util.Objects; - import javax.persistence.Column; import javax.persistence.Entity; +import java.io.Serializable; +import java.util.Objects; /** * A setting for storing a string value. diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java index 8e3af975c..72bedc293 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectIdResolver.java @@ -20,17 +20,16 @@ package org.libreccm.core; import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; +import org.libreccm.cdi.utils.CdiUtil; -import javax.inject.Inject; +import javax.enterprise.context.RequestScoped; /** * @author Tobias Osmers<\a> * @version created the 8/10/17 */ +@RequestScoped public class ResourceTypeIdResolver implements ObjectIdResolver { @Override public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { diff --git a/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java b/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java index 337b859cb..48ca2c0d3 100644 --- a/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java +++ b/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java @@ -23,6 +23,9 @@ import org.apache.logging.log4j.Logger; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.core.UnexpectedErrorException; +import javax.enterprise.inject.Instance; +import javax.faces.bean.RequestScoped; +import javax.inject.Inject; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -30,10 +33,6 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.Instance; -import javax.faces.bean.RequestScoped; -import javax.inject.Inject; - /** * This class provides access to the (local) file system. If available an * implementation of the {@link FileSystemAdapter} interface is used. The diff --git a/ccm-core/src/main/java/org/libreccm/files/NIOFileSystemAdapter.java b/ccm-core/src/main/java/org/libreccm/files/NIOFileSystemAdapter.java index 11013a61e..3f6f8acd3 100644 --- a/ccm-core/src/main/java/org/libreccm/files/NIOFileSystemAdapter.java +++ b/ccm-core/src/main/java/org/libreccm/files/NIOFileSystemAdapter.java @@ -20,16 +20,10 @@ package org.libreccm.files; import org.libreccm.configuration.ConfigurationManager; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import java.io.*; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -37,10 +31,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; - /** * This implementation of the {@link FileSystemAdapter} interface is used by * {@link CcmFiles} as a fallback if no other implementations are available. diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java index 9524b9df0..17f9fbec7 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java @@ -19,25 +19,15 @@ package org.libreccm.formbuilder; import org.libreccm.core.CcmObject; - -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.l10n.LocalizedString; +import javax.persistence.*; import java.io.Serializable; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.AssociationOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/DataDrivenSelect.java b/ccm-core/src/main/java/org/libreccm/formbuilder/DataDrivenSelect.java index 26de14c66..10a71cd13 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/DataDrivenSelect.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/DataDrivenSelect.java @@ -18,14 +18,13 @@ */ package org.libreccm.formbuilder; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/FormSection.java b/ccm-core/src/main/java/org/libreccm/formbuilder/FormSection.java index 9eb03d7d6..6432b8818 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/FormSection.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/FormSection.java @@ -18,18 +18,17 @@ */ package org.libreccm.formbuilder; -import static org.libreccm.core.CoreConstants.*; - +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.OneToMany; +import javax.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Listener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Listener.java index 5cd20cfec..a7359f24c 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/Listener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Listener.java @@ -20,15 +20,14 @@ package org.libreccm.formbuilder; import org.libreccm.core.CcmObject; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/MetaObject.java b/ccm-core/src/main/java/org/libreccm/formbuilder/MetaObject.java index 4222c19cb..128a71bbe 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/MetaObject.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/MetaObject.java @@ -20,14 +20,13 @@ package org.libreccm.formbuilder; import org.libreccm.core.CcmObject; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/ObjectType.java b/ccm-core/src/main/java/org/libreccm/formbuilder/ObjectType.java index c49b5a6b3..544bccfa9 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/ObjectType.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/ObjectType.java @@ -20,14 +20,13 @@ package org.libreccm.formbuilder; import org.libreccm.core.CcmObject; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java index 7350b3123..6312f5d32 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java @@ -18,19 +18,13 @@ */ package org.libreccm.formbuilder; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.l10n.LocalizedString; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.AssociationOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java b/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java index 644aa00f4..4d7d1ec02 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java @@ -19,20 +19,13 @@ package org.libreccm.formbuilder; import org.libreccm.core.CcmObject; - -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.l10n.LocalizedString; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.AssociationOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java index d49c42929..96ee4aff1 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java @@ -19,21 +19,13 @@ package org.libreccm.formbuilder; import org.libreccm.core.CcmObject; - -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.l10n.LocalizedString; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.AssociationOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Widget.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Widget.java index 1f491dc4a..01e97b050 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/Widget.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Widget.java @@ -18,18 +18,16 @@ */ package org.libreccm.formbuilder; -import static org.libreccm.core.CoreConstants.*; - +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.OneToMany; +import javax.persistence.Table; import java.io.Serializable; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java index 60f87b4c0..7839c591c 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmEmailListener.java @@ -5,17 +5,16 @@ */ package org.libreccm.formbuilder.actions; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; +import org.libreccm.formbuilder.ProcessListener; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; -import org.libreccm.formbuilder.ProcessListener; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmRedirectListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmRedirectListener.java index 95fa52087..8418db0eb 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmRedirectListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/ConfirmRedirectListener.java @@ -5,16 +5,15 @@ */ package org.libreccm.formbuilder.actions; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; +import org.libreccm.formbuilder.ProcessListener; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; -import org.libreccm.formbuilder.ProcessListener; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/RemoteServerPostListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/RemoteServerPostListener.java index fe7ca5c16..83137801d 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/RemoteServerPostListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/RemoteServerPostListener.java @@ -5,17 +5,15 @@ */ package org.libreccm.formbuilder.actions; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; - -import javax.persistence.Entity; -import javax.persistence.Table; - import org.libreccm.formbuilder.ProcessListener; import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java index 6ebd44a4f..4ef2f6c57 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/SimpleEmailListener.java @@ -5,18 +5,16 @@ */ package org.libreccm.formbuilder.actions; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; +import org.libreccm.formbuilder.ProcessListener; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; - -import org.libreccm.formbuilder.ProcessListener; - +import java.io.Serializable; import java.util.Objects; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; + /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/TemplateEmailListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/TemplateEmailListener.java index bfec0db57..ece8c2c9b 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/TemplateEmailListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/TemplateEmailListener.java @@ -5,17 +5,16 @@ */ package org.libreccm.formbuilder.actions; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; +import org.libreccm.formbuilder.ProcessListener; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; -import org.libreccm.formbuilder.ProcessListener; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlEmailListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlEmailListener.java index 93fe57668..72347b4e9 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlEmailListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/actions/XmlEmailListener.java @@ -5,16 +5,15 @@ */ package org.libreccm.formbuilder.actions; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; +import org.libreccm.formbuilder.ProcessListener; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; -import org.libreccm.formbuilder.ProcessListener; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java b/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java index 9cb8deaa2..d5143e837 100644 --- a/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java +++ b/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java @@ -18,10 +18,10 @@ */ package org.libreccm.jpa; -import javax.enterprise.context.ApplicationScoped; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.persistence.EntityManager; diff --git a/ccm-core/src/main/java/org/libreccm/jpa/utils/UriConverter.java b/ccm-core/src/main/java/org/libreccm/jpa/utils/UriConverter.java index f16065e54..470291037 100644 --- a/ccm-core/src/main/java/org/libreccm/jpa/utils/UriConverter.java +++ b/ccm-core/src/main/java/org/libreccm/jpa/utils/UriConverter.java @@ -18,10 +18,10 @@ */ package org.libreccm.jpa.utils; -import java.net.URI; -import java.net.URISyntaxException; import javax.persistence.AttributeConverter; import javax.persistence.Converter; +import java.net.URI; +import java.net.URISyntaxException; /** * A converter for converting URI properties to String. JPA does not support URI diff --git a/ccm-core/src/main/java/org/libreccm/messaging/Attachment.java b/ccm-core/src/main/java/org/libreccm/messaging/Attachment.java index f5ff66354..0b550476f 100644 --- a/ccm-core/src/main/java/org/libreccm/messaging/Attachment.java +++ b/ccm-core/src/main/java/org/libreccm/messaging/Attachment.java @@ -18,25 +18,15 @@ */ package org.libreccm.messaging; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.jpa.utils.MimeTypeConverter; +import javax.activation.MimeType; +import javax.persistence.*; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; -import javax.activation.MimeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/messaging/Message.java b/ccm-core/src/main/java/org/libreccm/messaging/Message.java index 0e8881bd4..db67a13e8 100644 --- a/ccm-core/src/main/java/org/libreccm/messaging/Message.java +++ b/ccm-core/src/main/java/org/libreccm/messaging/Message.java @@ -19,29 +19,18 @@ package org.libreccm.messaging; import org.libreccm.core.CcmObject; - -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.jpa.utils.MimeTypeConverter; import org.libreccm.security.User; +import javax.activation.MimeType; +import javax.persistence.*; import java.io.Serializable; import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Objects; -import javax.activation.MimeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/messaging/MessageThread.java b/ccm-core/src/main/java/org/libreccm/messaging/MessageThread.java index 50410dec2..9d712ce6e 100644 --- a/ccm-core/src/main/java/org/libreccm/messaging/MessageThread.java +++ b/ccm-core/src/main/java/org/libreccm/messaging/MessageThread.java @@ -20,15 +20,14 @@ package org.libreccm.messaging; import org.libreccm.core.CcmObject; -import static org.libreccm.core.CoreConstants.*; - -import java.io.Serializable; -import java.util.Objects; - import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Objects; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java index d749aec1f..37723d9ec 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java @@ -29,18 +29,13 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.service.spi.SessionFactoryServiceRegistry; import org.libreccm.search.SearchConfig; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import javax.sql.DataSource; +import java.sql.*; import java.util.List; import java.util.Locale; import java.util.Optional; import java.util.ServiceLoader; -import javax.sql.DataSource; - /** * Manages the database schema for new and updated modules. * diff --git a/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java b/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java index 898270d49..6b593df07 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java @@ -18,14 +18,14 @@ */ package org.libreccm.modules; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import javax.inject.Inject; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - /** * An implementation of the {@link ServletContextListener} interface for * initialising the modules. diff --git a/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java b/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java index 1331add15..82a95e35c 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java @@ -20,20 +20,11 @@ package org.libreccm.modules; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.libreccm.configuration.AbstractSetting; -import org.libreccm.configuration.BigDecimalSetting; -import org.libreccm.configuration.BooleanSetting; -import org.libreccm.configuration.Configuration; -import org.libreccm.configuration.DoubleSetting; -import org.libreccm.configuration.EnumSetting; -import org.libreccm.configuration.LocalizedStringSetting; -import org.libreccm.configuration.LongSetting; -import org.libreccm.configuration.Setting; -import org.libreccm.configuration.StringListSetting; -import org.libreccm.configuration.StringSetting; +import org.libreccm.configuration.*; import org.libreccm.core.CoreConstants; import org.libreccm.l10n.LocalizedString; +import javax.persistence.EntityManager; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; @@ -43,8 +34,6 @@ import java.util.Locale; import java.util.Properties; import java.util.Set; -import javax.persistence.EntityManager; - /** * A helper class used by the {@link ModuleManager} to load the initial * configuration values for the configurations of a module from the bundle and diff --git a/ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java b/ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java index 024e3c621..3da274121 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java +++ b/ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java @@ -18,15 +18,15 @@ */ package org.libreccm.modules; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.maven.artifact.versioning.ComparableVersion; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * This class implements topological sorting to determine the order in which the * modules are loaded and initialised. diff --git a/ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java b/ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java index e024fcabc..02f6c5e20 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java +++ b/ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java @@ -18,14 +18,9 @@ */ package org.libreccm.modules; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; import static org.libreccm.core.CoreConstants.DB_SCHEMA; diff --git a/ccm-core/src/main/java/org/libreccm/modules/Module.java b/ccm-core/src/main/java/org/libreccm/modules/Module.java index 673063bdf..0a28d3944 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/Module.java +++ b/ccm-core/src/main/java/org/libreccm/modules/Module.java @@ -20,17 +20,15 @@ package org.libreccm.modules; import org.libreccm.configuration.Configuration; import org.libreccm.configuration.ConfigurationManager; -import org.libreccm.pagemodel.ComponentModel; import org.libreccm.pagemodel.PageModelComponentModel; import org.libreccm.web.ApplicationType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; - -import static java.lang.annotation.ElementType.*; - import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.TYPE; + /** * Annotation for describing some meta data of a module. * diff --git a/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java index 64c019081..123792e9a 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java @@ -18,6 +18,9 @@ */ package org.libreccm.modules; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -25,9 +28,6 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - /** * A representation of the module metadata combining the data from the modules * info file and the annotations on the module class. diff --git a/ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java index c37679dda..c197f7db6 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java @@ -18,18 +18,19 @@ */ package org.libreccm.modules; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Properties; -import java.util.ServiceLoader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.transaction.Transactional; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Properties; +import java.util.ServiceLoader; /** * The {@code ModuleManager} manages the lifecycle of all modules. diff --git a/ccm-core/src/main/java/org/libreccm/notification/Digest.java b/ccm-core/src/main/java/org/libreccm/notification/Digest.java index cf254f202..8f403a598 100644 --- a/ccm-core/src/main/java/org/libreccm/notification/Digest.java +++ b/ccm-core/src/main/java/org/libreccm/notification/Digest.java @@ -19,22 +19,14 @@ package org.libreccm.notification; import org.libreccm.core.CcmObject; - -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.security.Party; +import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/notification/Notification.java b/ccm-core/src/main/java/org/libreccm/notification/Notification.java index 93278aea0..1a76038e8 100644 --- a/ccm-core/src/main/java/org/libreccm/notification/Notification.java +++ b/ccm-core/src/main/java/org/libreccm/notification/Notification.java @@ -19,23 +19,15 @@ package org.libreccm.notification; import org.libreccm.core.CcmObject; - -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.messaging.Message; import org.libreccm.security.Party; +import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/notification/QueueItem.java b/ccm-core/src/main/java/org/libreccm/notification/QueueItem.java index cc27dea31..2a4f22f9a 100644 --- a/ccm-core/src/main/java/org/libreccm/notification/QueueItem.java +++ b/ccm-core/src/main/java/org/libreccm/notification/QueueItem.java @@ -18,22 +18,14 @@ */ package org.libreccm.notification; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.messaging.Message; import org.libreccm.security.Party; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * Represents a notification that has been transferred to the outbound message diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageBuilder.java b/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageBuilder.java index b62db70a7..e65b0bd18 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageBuilder.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageBuilder.java @@ -18,8 +18,8 @@ */ package org.libreccm.pagemodel; -import java.util.Optional; import javax.inject.Inject; +import java.util.Optional; /** * An abstract base class for implementations of the {@link PageBuilder} diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentBuilderManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentBuilderManager.java index 1eebcaf64..3b5052209 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentBuilderManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentBuilderManager.java @@ -18,14 +18,15 @@ */ package org.libreccm.pagemodel; -import java.util.Iterator; -import java.util.Optional; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Instance; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import java.util.Iterator; +import java.util.Optional; /** * Provides access to all available implementations of the diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java index 27f2fbab7..d266e8287 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java @@ -20,21 +20,11 @@ package org.libreccm.pagemodel; import org.libreccm.core.CoreConstants; +import javax.persistence.*; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - /** * Base class for the components model for use in a {@link PageModel}. This * class is not designed for direct use. Instead the classes for concrete diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java index aa2dda986..ba3a8adca 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java @@ -23,10 +23,9 @@ import org.libreccm.core.CoreConstants; import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; -import java.util.UUID; - import javax.enterprise.context.RequestScoped; import javax.transaction.Transactional; +import java.util.UUID; /** * Repository class for managing {@link ComponentModel} entities. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelType.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelType.java index c08a9c5d5..9c07da24d 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelType.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelType.java @@ -18,13 +18,12 @@ */ package org.libreccm.pagemodel; +import javax.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - /** * Specifies for which component and view technology a {@link ComponentBuilder} builds the * components. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageBuilderManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageBuilderManager.java index 392a50b04..a12f05612 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageBuilderManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageBuilderManager.java @@ -22,13 +22,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.libreccm.web.CcmApplication; -import java.util.Iterator; -import java.util.Optional; - import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Instance; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; +import java.util.Iterator; +import java.util.Optional; /** * Provides access to all available {@link PageBuilder} implementations. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java index 6787109db..a7f02e3ba 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java @@ -22,31 +22,13 @@ import org.libreccm.core.CoreConstants; import org.libreccm.l10n.LocalizedString; import org.libreccm.web.CcmApplication; +import javax.persistence.*; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.AssociationOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - /** * A {@link PageModel} is used by a {@link PageBuilder} implementation to build * a page. The {@code PageModel} specifics which components are used on a page. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java index d22313fb3..537cd2d05 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java @@ -28,27 +28,19 @@ import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; import org.libreccm.web.CcmApplication; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; -import java.util.ServiceLoader; -import java.util.Set; - import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import javax.transaction.Transactional; +import java.beans.BeanInfo; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.*; /** * Provides several methods for managing {@link PageModel}s. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java index 5194bb87e..7b8bf2075 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java @@ -24,13 +24,12 @@ import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; import org.libreccm.web.CcmApplication; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - import javax.enterprise.context.RequestScoped; import javax.persistence.TypedQuery; import javax.transaction.Transactional; +import java.util.List; +import java.util.Optional; +import java.util.UUID; /** * Repository for {@link PageModel}s. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelType.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelType.java index d444b4a8b..a9adf5f5a 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelType.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelType.java @@ -20,13 +20,12 @@ package org.libreccm.pagemodel; import org.libreccm.web.CcmApplication; +import javax.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - /** * Specifies for which application type and which view technology a * {@link PageBuilder} builds the pages. diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java index 7d4cb9372..17e6593c6 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java @@ -20,11 +20,12 @@ package org.libreccm.pagemodel.ui; import com.arsdigita.bebop.tree.TreeNode; import com.arsdigita.kernel.KernelConfig; -import java.util.Locale; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.web.CcmApplication; +import java.util.Locale; + /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java index ad8a461ca..928d343dc 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java @@ -20,7 +20,6 @@ package org.libreccm.pagemodel.ui; import com.arsdigita.bebop.Tree; import com.arsdigita.toolbox.ui.LayoutPanel; -import java.util.Map; /** * diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java index 4364f556f..9fd064718 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java @@ -18,12 +18,13 @@ */ package org.libreccm.pagemodel.ui; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; import org.libreccm.web.ApplicationManager; import org.libreccm.web.ApplicationType; import org.libreccm.web.CcmApplication; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; + /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java index 0aaffa4ee..3bf14309e 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java @@ -20,11 +20,12 @@ package org.libreccm.pagemodel.ui; import com.arsdigita.bebop.tree.TreeNode; import com.arsdigita.kernel.KernelConfig; -import java.util.Locale; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.pagemodel.PageModel; +import java.util.Locale; + /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java index 3b7558d0e..c32b1738e 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java @@ -21,13 +21,12 @@ package org.libreccm.pagemodel.ui; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.tree.TreeModel; import com.arsdigita.bebop.tree.TreeNode; - -import java.util.Iterator; - import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.pagemodel.PageModelRepository; import org.libreccm.web.CcmApplication; +import java.util.Iterator; + /** * * @author Jens Pelzetter diff --git a/ccm-core/src/main/java/org/libreccm/portal/Portal.java b/ccm-core/src/main/java/org/libreccm/portal/Portal.java index ceafa0d98..2613ba538 100644 --- a/ccm-core/src/main/java/org/libreccm/portal/Portal.java +++ b/ccm-core/src/main/java/org/libreccm/portal/Portal.java @@ -18,19 +18,18 @@ */ package org.libreccm.portal; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.core.Resource; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.OneToMany; import javax.persistence.Table; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/portal/Portlet.java b/ccm-core/src/main/java/org/libreccm/portal/Portlet.java index 1420fbcf5..73bb5ce76 100644 --- a/ccm-core/src/main/java/org/libreccm/portal/Portlet.java +++ b/ccm-core/src/main/java/org/libreccm/portal/Portlet.java @@ -18,18 +18,13 @@ */ package org.libreccm.portal; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.core.Resource; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/runtime/Initalizer.java b/ccm-core/src/main/java/org/libreccm/runtime/Initalizer.java index fbde9db71..75fc26729 100644 --- a/ccm-core/src/main/java/org/libreccm/runtime/Initalizer.java +++ b/ccm-core/src/main/java/org/libreccm/runtime/Initalizer.java @@ -18,23 +18,14 @@ */ package org.libreccm.runtime; -import static org.libreccm.core.CoreConstants.*; - +import javax.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/search/SearchManager.java b/ccm-core/src/main/java/org/libreccm/search/SearchManager.java index 083f8af2a..de9631ae7 100644 --- a/ccm-core/src/main/java/org/libreccm/search/SearchManager.java +++ b/ccm-core/src/main/java/org/libreccm/search/SearchManager.java @@ -28,14 +28,13 @@ import org.libreccm.core.CoreConstants; import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; -import java.util.List; -import java.util.concurrent.Future; - import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.transaction.Transactional; +import java.util.List; +import java.util.concurrent.Future; /** * Provides an interface to Hibernate search. The methods here can be used to diff --git a/ccm-core/src/main/java/org/libreccm/search/lucene/Document.java b/ccm-core/src/main/java/org/libreccm/search/lucene/Document.java index 6313acdc2..6db08165a 100644 --- a/ccm-core/src/main/java/org/libreccm/search/lucene/Document.java +++ b/ccm-core/src/main/java/org/libreccm/search/lucene/Document.java @@ -18,25 +18,14 @@ */ package org.libreccm.search.lucene; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.security.User; +import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/search/lucene/Index.java b/ccm-core/src/main/java/org/libreccm/search/lucene/Index.java index 587cc23d1..80792e6da 100644 --- a/ccm-core/src/main/java/org/libreccm/search/lucene/Index.java +++ b/ccm-core/src/main/java/org/libreccm/search/lucene/Index.java @@ -18,21 +18,13 @@ */ package org.libreccm.search.lucene; -import static org.libreccm.core.CoreConstants.*; - import org.libreccm.web.Host; +import javax.persistence.*; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import static org.libreccm.core.CoreConstants.DB_SCHEMA; /** * diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java index a0710a01d..e082315e1 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java @@ -22,12 +22,14 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; +import javax.enterprise.context.RequestScoped; + /** * @author Tobias Osmers * @version created on 3/23/17 */ +@RequestScoped public class PartyIdResolver implements ObjectIdResolver { - @Override public void bindItem(final ObjectIdGenerator.IdKey id, final Object pojo) { diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionIdGenerator.java b/ccm-core/src/main/java/org/libreccm/security/PermissionIdGenerator.java index a6d441b8d..453b1c3bc 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionIdGenerator.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionIdGenerator.java @@ -69,8 +69,8 @@ public class PermissionIdGenerator extends ObjectIdGenerator { return String.join("_", permission.getGrantedPrivilege(), - String.valueOf(permission.getGrantee().getRoleId()), - String.valueOf(permission.getObject().getObjectId()) + String.valueOf(permission.getGrantee().getName()), + String.valueOf(permission.getObject().getUuid()) ); } } diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java index 8bc452a5b..3ac28c3df 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionIdResolver.java @@ -20,25 +20,20 @@ package org.libreccm.security; import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; +import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; import org.libreccm.core.UnexpectedErrorException; -import javax.inject.Inject; +import javax.enterprise.context.RequestScoped; import java.util.Optional; /** * @author grantee = roleRepository.findById(granteeId); + final Optional object = ccmObjectRepository + .findObjectByUuid(objectUuid); + final Optional grantee = roleRepository + .findByName(granteeName); if (!grantee.isPresent()) { throw new UnexpectedErrorException(String.format( "Role with id \"%s\" was not found in the database," + - " but has been associated with a permission.", - granteeId)); + " but has been associated with a permission.", + granteeName)); } - final Optional object = ccmObjectRepository.findObjectById - (objectId); Optional permission = permissionRepository - .findByCustomPermId(privilege, - grantee.get(), - object.orElse(null)); + .findByCustomPermId(privilege, + grantee.get(), + object.orElse(null)); + if (!permission.isPresent()) { throw new UnexpectedErrorException(String.format( "Permission with privilege \"%s\", grantee \"%s and " + diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java b/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java index b913fd2f4..24731f6c8 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java @@ -20,7 +20,7 @@ package org.libreccm.security; import org.libreccm.core.AbstractEntityRepository; -import javax.faces.bean.RequestScoped; +import javax.enterprise.context.RequestScoped; import javax.persistence.NoResultException; import javax.persistence.TypedQuery; import java.util.Optional; diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java index b24c146ae..9bf5b4b58 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java @@ -22,12 +22,14 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; +import javax.enterprise.context.RequestScoped; + /** * @author new IllegalArgumentException(String .format("No User with name %s in the database.", diff --git a/ccm-core/src/main/java/org/libreccm/themes/StaticThemesServlet.java b/ccm-core/src/main/java/org/libreccm/themes/StaticThemesServlet.java index 7c7c8a735..acf0b1d42 100644 --- a/ccm-core/src/main/java/org/libreccm/themes/StaticThemesServlet.java +++ b/ccm-core/src/main/java/org/libreccm/themes/StaticThemesServlet.java @@ -22,17 +22,16 @@ import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.util.Set; - import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AuthorizationListener.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AuthorizationListener.java index b603db11b..7f4d76b68 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/AuthorizationListener.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AuthorizationListener.java @@ -21,13 +21,13 @@ package org.libreccm.ui.admin; import com.arsdigita.web.BaseServlet; import com.arsdigita.web.CCMDispatcherServlet; import com.arsdigita.web.WebConfig; - import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.net.URLCodec; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.shiro.subject.Subject; +import org.libreccm.configuration.ConfigurationManager; +import org.libreccm.security.PermissionChecker; import javax.enterprise.context.RequestScoped; import javax.faces.context.ExternalContext; @@ -37,12 +37,9 @@ import javax.inject.Inject; import javax.inject.Named; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.apache.shiro.subject.Subject; -import org.libreccm.configuration.ConfigurationManager; -import org.libreccm.security.PermissionChecker; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; /** * diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/UserContextController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/UserContextController.java index 443921b9e..e90782691 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/UserContextController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/UserContextController.java @@ -18,14 +18,13 @@ */ package org.libreccm.ui.admin; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.shiro.subject.Subject; import org.libreccm.security.Shiro; import org.libreccm.security.User; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.inject.Named; import java.io.Serializable; import java.util.Optional; diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sysinfo/SysInfoController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sysinfo/SysInfoController.java index 491ed31ab..b9868cc7e 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/sysinfo/SysInfoController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sysinfo/SysInfoController.java @@ -20,15 +20,6 @@ package org.libreccm.ui.admin.sysinfo; import org.xml.sax.SAXException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.ResourceBundle; -import java.util.logging.Level; -import java.util.logging.Logger; - import javax.enterprise.context.RequestScoped; import javax.inject.Named; import javax.xml.parsers.DocumentBuilderFactory; @@ -36,6 +27,12 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.ResourceBundle; /** * diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java index 371c30df0..ea83631fe 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java @@ -27,18 +27,14 @@ import org.libreccm.security.RoleRepository; import org.primefaces.model.LazyDataModel; import org.primefaces.model.SortOrder; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import java.util.Set; - import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; import javax.transaction.Transactional; +import java.io.Serializable; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * diff --git a/ccm-core/src/main/java/org/libreccm/web/CcmApplicationIdResolver.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java similarity index 89% rename from ccm-core/src/main/java/org/libreccm/web/CcmApplicationIdResolver.java rename to ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java index 75c817fbc..9b82d0c0a 100644 --- a/ccm-core/src/main/java/org/libreccm/web/CcmApplicationIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java @@ -22,11 +22,14 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; +import javax.enterprise.context.RequestScoped; + /** * @author { public String generateId(final Object forPojo) { if (!(forPojo instanceof TaskAssignment)) { throw new IllegalArgumentException( - "Only RoleMembership instances are supported."); + "Only TaskAssignment instances are supported."); } final TaskAssignment assignment = (TaskAssignment) forPojo; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java index dc1675636..df9663ae6 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskIdResolver.java @@ -20,17 +20,16 @@ package org.libreccm.workflow; import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; +import org.libreccm.cdi.utils.CdiUtil; -import javax.inject.Inject; +import javax.enterprise.context.RequestScoped; /** * @author findByUuid(final String uuid) { + if (uuid == null || uuid.trim().isEmpty()) { + throw new IllegalArgumentException( + "The UUID of the WorkflowTemplate to retrieve can't be " + + "null or empty."); + } + + final TypedQuery query = getEntityManager() + .createNamedQuery("WorkflowTemplate.findByUuid", + WorkflowTemplate.class); + query.setParameter("uuid", uuid); + + try { + return Optional.of(query.getSingleResult()); + } catch(NoResultException ex) { + return Optional.empty(); + } + } } diff --git a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java index 91dfb97f4..4c0eade0b 100644 --- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java @@ -88,8 +88,12 @@ public class CoreDataImportTest { .class.getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil .class.getPackage()) + .addPackage(org.libreccm.configuration.ConfigurationManager + .class.getPackage()) .addPackage(org.libreccm.core.CcmObject .class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer + .class.getPackage()) .addPackage(org.libreccm.l10n.LocalizedString .class.getPackage()) .addPackage(org.libreccm.portation.AbstractMarshaller @@ -98,16 +102,12 @@ public class CoreDataImportTest { .class.getPackage()) .addPackage(org.libreccm.workflow.AssignableTask .class.getPackage()) - .addPackage(org.libreccm.configuration.ConfigurationManager + .addPackage(org.libreccm.web.CcmApplication .class.getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest .class.getPackage()) .addPackage(org.libreccm.testutils.EqualsVerifier .class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication - .class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer - .class.getPackage()) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") @@ -152,6 +152,12 @@ public class CoreDataImportTest { Assert.assertFalse(importHelper.importDomains()); Assert.assertFalse(importHelper.importDomainOwnerships()); + Assert.assertFalse(importHelper.importPermissions()); + + Assert.assertFalse(importHelper.importWorkflowTemplates()); + //Assert.assertFalse(importHelper.importWorkflows()); + + } } diff --git a/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java b/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java index 0982517b4..3d5e50e78 100644 --- a/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java +++ b/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java @@ -23,7 +23,7 @@ import org.libreccm.core.ResourceType; import org.libreccm.core.ResourceTypeMarshaller; import org.libreccm.security.*; import org.libreccm.web.CcmApplication; -import org.libreccm.web.CcmApplicationMarshaller; +import org.libreccm.web.ApplicationMarshaller; import org.libreccm.workflow.*; import javax.enterprise.context.RequestScoped; @@ -71,7 +71,7 @@ class ImportHelper { private ResourceTypeMarshaller resourceTypeMarshaller; @Inject @Marshals(CcmApplication.class) - private CcmApplicationMarshaller ccmApplicationMarshaller; + private ApplicationMarshaller applicationMarshaller; @Inject @Marshals(Domain.class) private DomainMarshaller domainMarshaller; @@ -170,12 +170,12 @@ class ImportHelper { } boolean importCcmApplications() { - ccmApplicationMarshaller.prepare( + applicationMarshaller.prepare( Format.XML, repoPath + projectPath, "ccmApplications.xml", indentation); - return ccmApplicationMarshaller.importFile(); + return applicationMarshaller.importFile(); } boolean importDomains() { @@ -196,6 +196,15 @@ class ImportHelper { return domainOwnershipMarshaller.importFile(); } + boolean importPermissions() { + permissionMarshaller.prepare( + Format.XML, + repoPath + projectPath, + "permissions.xml", + indentation); + return permissionMarshaller.importFile(); + } + boolean importWorkflowTemplates() { workflowTemplateMarshaller.prepare( Format.XML, @@ -232,13 +241,4 @@ class ImportHelper { return taskAssignmentMarshaller.importFile(); } - boolean importPermissions() { - permissionMarshaller.prepare( - Format.XML, - repoPath + projectPath, - "permissions.xml", - indentation); - return permissionMarshaller.importFile(); - } - }