[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

Former-commit-id: d7da3652fd

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.*;
-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 javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
+import java.util.ResourceBundle;
 
 /**
  *

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.*;
-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 org.libreccm.configuration.ConfigurationInfo;
 import org.libreccm.configuration.SettingInfo;
 import org.libreccm.core.UnexpectedErrorException;

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;
 
 /**
  *

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>

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.*;
-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 java.util.ResourceBundle;
 

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.*;
-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.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.*;
-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 java.util.ResourceBundle;
 

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.*;
-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 org.libreccm.security.Group;
 import org.libreccm.security.GroupManager;
 import org.libreccm.security.GroupRepository;

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.*;
-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 javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
+import java.util.Set;
 
 /**
  *

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;
 
 /**
  *

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.*;
-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 javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
+import java.util.Set;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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.*;
-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.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;
 

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;
 
 /**
  *

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.*;
-import com.vaadin.ui.CustomComponent;
-import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.Image;
-import com.vaadin.ui.Label;
 
 import javax.servlet.ServletContext;
 

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.*;
-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 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.*;
-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.stream.Collectors;
 
-import javax.persistence.Id;
-import javax.persistence.PersistenceException;
-
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>

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;
 
 /**
  *

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;
 

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.*;
-import com.vaadin.ui.Grid;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.Window;
 import com.vaadin.ui.components.grid.HeaderCell;
 import com.vaadin.ui.components.grid.HeaderRow;
 import com.vaadin.ui.themes.ValoTheme;

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;
 
 /**
  *

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.*;
-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.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.*;
-import org.libreccm.security.PartyRepository;
-import org.libreccm.security.Role;
-import org.libreccm.security.RoleManager;
-import org.libreccm.security.RoleRepository;
 
 import java.util.ResourceBundle;
 

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.*;
-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 org.libreccm.security.Role;
 import org.libreccm.security.RoleManager;
 import org.libreccm.security.RoleRepository;

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.*;
-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 javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
+import java.util.Set;
 
 /**
  *

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;
 
 /**
  *

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;

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;
 
 /**
  *

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.*;
-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.components.grid.HeaderCell;
 import com.vaadin.ui.components.grid.HeaderRow;
 import com.vaadin.ui.renderers.ButtonRenderer;

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;
 
 /**
  *

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.*;
-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.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.*;
-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 java.util.ResourceBundle;
 

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.*;
-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 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>

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.*;
-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 javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
+import java.util.Set;
 
 /**
  *

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;
 
 /**
  *

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.*;
-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 javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
+import java.util.Set;
 
 /**
  *

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;
 
 /**
  *

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.*;
-import com.vaadin.ui.Grid;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.Window;
 import com.vaadin.ui.components.grid.HeaderCell;
 import com.vaadin.ui.components.grid.HeaderRow;
 import com.vaadin.ui.themes.ValoTheme;

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;
 
 /**
  *

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;

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.*;
-import com.vaadin.ui.Grid;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.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;

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;
 
 /**
  *

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;
 

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

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;

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 <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 3/23/17
  */
+@RequestScoped
 public class CategoryIdResolver implements ObjectIdResolver {
-
     @Override
     public void bindItem(ObjectIdGenerator.IdKey idKey,
                          Object pojo) {

ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java

@@ -22,10 +22,13 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
 import org.libreccm.cdi.utils.CdiUtil;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created the 8/2/17
  */
+@RequestScoped
 public class DomainIdResolver implements ObjectIdResolver {
     @Override
     public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) {

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;
 
 /**
  *

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.

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

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.

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.*;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.NavigableMap;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.TreeMap;
 
 /**
  * Describes a configuration. Useful for generating user interfaces.

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 javax.enterprise.context.RequestScoped;
-import java.util.HashMap;
+import javax.inject.Inject;
-import java.util.List;
+import javax.transaction.Transactional;
-import java.util.Map;
+import java.lang.reflect.Field;
-import java.util.ServiceLoader;
+import java.util.*;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**

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

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.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Objects;
 
-import javax.persistence.ElementCollection;
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 
 /**
  * A setting class for storing a set of strings. This can be used to generate

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.*;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Set;
 
 /**
  * Example of configuration with all available setting types. Not used anywhere

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 
 /**
  * A setting which stores a {@link LocalizedString} . This can be used for

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.

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.
  *

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;
 
 /**

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 
 /**
  * Setting for a list of strings. In contrast to the {@link EnumSetting} which

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.

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 <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 3/23/17
  */
+@RequestScoped
 public class CcmObjectIdResolver implements ObjectIdResolver {
-    @Inject
-    private CcmObjectRepository ccmObjectRepository;
-
     @Override
     public void bindItem(ObjectIdGenerator.IdKey idKey,
                          Object pojo) {
@@ -41,7 +40,15 @@ public class CcmObjectIdResolver implements ObjectIdResolver {
 
     @Override
     public Object resolveId(ObjectIdGenerator.IdKey id) {
-        return ccmObjectRepository.findObjectByUuid(id.key.toString());
+        final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
+        final CcmObjectRepository ccmObjectRepository = cdiUtil
+                .findBean(CcmObjectRepository.class);
+
+        return ccmObjectRepository
+                .findObjectByUuid(id.key.toString())
+                .orElseThrow(() -> new IllegalArgumentException(String
+                        .format("No CcmObject with uuid %s in the database.",
+                                id.key.toString())));
     }
 
     @Override

ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java

@@ -22,10 +22,13 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
 import org.libreccm.cdi.utils.CdiUtil;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created the 8/10/17
  */
+@RequestScoped
 public class ResourceIdResolver implements ObjectIdResolver {
     @Override
     public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) {
@@ -37,8 +40,8 @@ public class ResourceIdResolver implements ObjectIdResolver {
     @Override
     public Object resolveId(ObjectIdGenerator.IdKey id) {
         final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
-        final ResourceRepository resourceRepository = cdiUtil.findBean
+        final ResourceRepository resourceRepository = cdiUtil
-                (ResourceRepository.class);
+                .findBean(ResourceRepository.class);
 
         return resourceRepository
                 .findByUuid(id.key.toString())

ccm-core/src/main/java/org/libreccm/core/ResourceTypeIdResolver.java

@@ -22,10 +22,13 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
 import org.libreccm.cdi.utils.CdiUtil;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created the 8/10/17
  */
+@RequestScoped
 public class ResourceTypeIdResolver implements ObjectIdResolver {
     @Override
     public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) {

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

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 javax.annotation.PostConstruct;
-import java.io.FileNotFoundException;
+import javax.enterprise.context.RequestScoped;
-import java.io.FileOutputStream;
+import javax.inject.Inject;
-import java.io.FileReader;
+import java.io.*;
-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 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.

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-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;
 
 /**
  *

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;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Table;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Table;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 
 /**
  *

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 org.libreccm.formbuilder.ProcessListener;
-
-import java.io.Serializable;
-import java.util.Objects;
 
 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;
 
 /**
  *

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 org.libreccm.formbuilder.ProcessListener;
-
-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 org.libreccm.formbuilder.ProcessListener;
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 /**
  *

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;
 
 /**
  *

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 org.libreccm.formbuilder.ProcessListener;
-
-import java.io.Serializable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-
+import java.io.Serializable;
-import org.libreccm.formbuilder.ProcessListener;
-
 import java.util.Objects;
 
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>

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 org.libreccm.formbuilder.ProcessListener;
-
-import java.io.Serializable;
-import java.util.Objects;
 
 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;
 
 /**
  *

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 org.libreccm.formbuilder.ProcessListener;
-
-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 org.libreccm.formbuilder.ProcessListener;
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 /**
  *

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;

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

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-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;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-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;
 
 /**
  *

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;
 
 /**
  *

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 javax.sql.DataSource;
-import java.sql.PreparedStatement;
+import java.sql.*;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
 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.
  *

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.

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.*;
-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.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

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.

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;
 

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.
  *

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.

ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java

@@ -18,18 +18,19 @@
  */
 package org.libreccm.modules;
 
-import java.io.IOException;
+import org.apache.logging.log4j.LogManager;
-import java.io.InputStream;
+import org.apache.logging.log4j.Logger;
-import java.util.List;
+
-import java.util.Properties;
-import java.util.ServiceLoader;
 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 java.io.IOException;
-import org.apache.logging.log4j.Logger;
+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.

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  *

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 static org.libreccm.core.CoreConstants.DB_SCHEMA;
-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;
 
 /**
  * Represents a notification that has been transferred to the outbound message

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}

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentBuilderManager.java

@@ -18,14 +18,15 @@
  */
 package org.libreccm.pagemodel;
 
-import java.util.Iterator;
+import org.apache.logging.log4j.LogManager;
-import java.util.Optional;
+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 java.util.Iterator;
-import org.apache.logging.log4j.Logger;
+import java.util.Optional;
 
 /**
  * Provides access to all available implementations of the

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

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.