From f15c70597bdbd96dd577292ebb2e98cb0d2a1547 Mon Sep 17 00:00:00 2001 From: tosmers Date: Wed, 24 Jan 2018 18:10:59 +0000 Subject: [PATCH] [CCM][UPDATE] - adds all missing serialVersionUIDs to import/export classes (e.g. Manager, Repository, Marshaller, IdGenerator, IdResolver) - marks Marshaller-class (interface import/export to gui) as deprecated, to force review when implementing gui for import/export git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5216 8810af33-2d31-482b-a856-94f89814c4df Former-commit-id: 52aec29e423e2aa2556f1b8f53cfd1e69358e091 --- .../CategorizationIdGenerator.java | 2 + .../CategorizationMarshaller.java | 5 ++- .../categorization/CategoryIdResolver.java | 5 ++- .../categorization/CategoryManager.java | 4 +- .../categorization/CategoryMarshaller.java | 3 ++ .../categorization/DomainIdResolver.java | 5 ++- .../categorization/DomainManager.java | 5 ++- .../categorization/DomainMarshaller.java | 3 ++ .../DomainOwnershipIdGenerator.java | 2 + .../DomainOwnershipMarshaller.java | 2 + .../categorization/DomainRepository.java | 2 + .../libreccm/core/CcmObjectIdResolver.java | 5 ++- .../libreccm/core/CcmObjectRepository.java | 2 + .../org/libreccm/core/ResourceIdResolver.java | 5 ++- .../org/libreccm/core/ResourceRepository.java | 2 + .../libreccm/core/ResourceTypeIdResolver.java | 5 ++- .../libreccm/core/ResourceTypeMarshaller.java | 2 + .../libreccm/core/ResourceTypeRepository.java | 2 + .../portation/AbstractMarshaller.java | 5 ++- .../org/libreccm/portation/Marshaller.java | 6 ++- .../libreccm/security/GroupIdResolver.java | 5 ++- .../org/libreccm/security/GroupManager.java | 4 +- .../libreccm/security/GroupMarshaller.java | 2 + .../security/GroupMembershipIdGenerator.java | 2 + .../security/GroupMembershipMarshaller.java | 2 + .../libreccm/security/GroupRepository.java | 2 + .../libreccm/security/PartyIdResolver.java | 5 ++- .../security/PermissionIdGenerator.java | 2 + .../security/PermissionIdResolver.java | 5 ++- .../libreccm/security/PermissionManager.java | 4 +- .../security/PermissionMarshaller.java | 1 + .../security/PermissionRepository.java | 2 + .../org/libreccm/security/RoleIdResolver.java | 5 ++- .../org/libreccm/security/RoleMarshaller.java | 1 + .../security/RoleMembershipIdGenerator.java | 2 + .../security/RoleMembershipMarshaller.java | 3 +- .../org/libreccm/security/UserIdResolver.java | 5 ++- .../org/libreccm/security/UserManager.java | 4 +- .../org/libreccm/security/UserMarshaller.java | 1 + .../libreccm/web/ApplicationIdResolver.java | 5 ++- .../org/libreccm/web/ApplicationManager.java | 45 ++++++++++--------- .../libreccm/web/ApplicationMarshaller.java | 1 + .../workflow/AssignableTaskIdResolver.java | 6 ++- .../workflow/AssignableTaskManager.java | 4 +- .../workflow/AssignableTaskMarshaller.java | 1 + .../workflow/AssignableTaskRepository.java | 1 + .../workflow/TaskAssignmentIdGenerator.java | 2 + .../workflow/TaskAssignmentMarshaller.java | 1 + .../workflow/TaskCommentIdResolver.java | 6 ++- .../workflow/TaskCommentMarshaller.java | 1 + .../workflow/TaskCommentRepository.java | 2 + .../workflow/TaskDependencyIdGenerator.java | 2 + .../workflow/TaskDependencyMarshaller.java | 1 + .../org/libreccm/workflow/TaskIdResolver.java | 5 ++- .../org/libreccm/workflow/TaskManager.java | 4 +- .../org/libreccm/workflow/TaskRepository.java | 1 + .../libreccm/workflow/WorkflowIdResolver.java | 5 ++- .../libreccm/workflow/WorkflowManager.java | 4 +- .../libreccm/workflow/WorkflowMarshaller.java | 1 + .../libreccm/workflow/WorkflowRepository.java | 1 + .../portation/CoreDataImportTest.java | 1 - 61 files changed, 180 insertions(+), 49 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationIdGenerator.java b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationIdGenerator.java index ad54542dd..ea70aae75 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationIdGenerator.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationIdGenerator.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; * @version created on 3/23/17 */ public class CategorizationIdGenerator extends ObjectIdGenerator { + private static final long serialVersionUID = 3013739402534056286L; + @Override public Class getScope() { return Categorization.class; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java index a59223507..d8a9ca004 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java @@ -25,6 +25,7 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.transaction.Transactional; +import java.io.Serializable; /** * @author Tobias Osmers * @version created on 3/23/17 */ @RequestScoped -public class CategoryIdResolver implements ObjectIdResolver { +public class CategoryIdResolver implements Serializable, ObjectIdResolver { + private static final long serialVersionUID = -5750627754502675522L; + @Override public void bindItem(ObjectIdGenerator.IdKey idKey, Object pojo) { diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java index 879578ec6..4eec9d355 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java @@ -37,6 +37,7 @@ import javax.transaction.Transactional; import static org.libreccm.categorization.CategorizationConstants.PRIVILEGE_MANAGE_CATEGORY; import static org.libreccm.categorization.CategorizationConstants.PRIVILEGE_MANAGE_CATEGORY_OBJECTS; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -51,7 +52,8 @@ import java.util.StringJoiner; * @author Jens Pelzetter */ @RequestScoped -public class CategoryManager { +public class CategoryManager implements Serializable { + private static final long serialVersionUID = -3354487547729008811L; private static final Logger LOGGER = LogManager.getLogger( CategoryManager.class); diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java index df0a990d5..64b45f485 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java @@ -24,6 +24,7 @@ import org.libreccm.portation.Marshals; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; +import java.io.Serializable; /** * @author Tobias Osmers @@ -33,6 +34,8 @@ import javax.transaction.Transactional; @Marshals(Category.class) public class CategoryMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = -9089135773302229477L; + @Inject private CategoryRepository categoryRepository; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java index 7f886c102..068c4f514 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Jens Pelzetter */ @RequestScoped -public class DomainManager { +public class DomainManager implements Serializable { + + private static final long serialVersionUID = -8921596414159020455L; @Inject private ApplicationRepository applicationRepo; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainMarshaller.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainMarshaller.java index d7c53f3c0..3c6a5c209 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainMarshaller.java @@ -23,6 +23,7 @@ import org.libreccm.portation.Marshals; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; +import java.io.Serializable; /** * @author Tobias Osmers * @version created on 3/23/17 */ @RequestScoped -public class CcmObjectIdResolver implements ObjectIdResolver { +public class CcmObjectIdResolver implements Serializable, ObjectIdResolver { + private static final long serialVersionUID = 246452778202614974L; + @Override public void bindItem(ObjectIdGenerator.IdKey idKey, Object pojo) { diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java index 7f5254220..45934f826 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java @@ -42,6 +42,8 @@ import static org.libreccm.core.CoreConstants.ACCESS_DENIED; @RequestScoped public class CcmObjectRepository extends AbstractEntityRepository { + private static final long serialVersionUID = 5033157795875521195L; + @Override public Class getEntityClass() { return CcmObject.class; diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java b/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java index 7452028da..7f7c4f33e 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Tobias Osmers<\a> * @version created the 8/10/17 */ @RequestScoped -public class ResourceTypeIdResolver implements ObjectIdResolver { +public class ResourceTypeIdResolver implements Serializable, ObjectIdResolver { + private static final long serialVersionUID = -3756063950193704821L; + @Override public void bindItem(ObjectIdGenerator.IdKey idKey, Object o) { // According to the Jackson JavaDoc, this method can be used to keep diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeMarshaller.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeMarshaller.java index d055ba583..0f2ce2e94 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeMarshaller.java @@ -32,6 +32,8 @@ import javax.inject.Inject; @Marshals(ResourceType.class) public class ResourceTypeMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = 79174993117568181L; + @Inject private ResourceTypeRepository resourceTypeRepository; diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java index 9bb1fc931..eadcd2828 100644 --- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeRepository.java @@ -37,6 +37,8 @@ import java.util.Optional; public class ResourceTypeRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -6313169146990554867L; + @Override public Class getEntityClass() { return ResourceType.class; diff --git a/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java b/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java index e026693ae..57eef45ef 100644 --- a/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java @@ -28,6 +28,7 @@ import org.apache.logging.log4j.Logger; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.io.Serializable; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; @@ -42,7 +43,9 @@ import java.util.List; * @version created the 2/10/16 * @param

*/ -public abstract class AbstractMarshaller

{ +public abstract class AbstractMarshaller

implements Serializable { + + private static final long serialVersionUID = -5796378713915256691L; private static final Logger LOGGER = LogManager.getLogger( AbstractMarshaller.class); diff --git a/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java b/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java index 106c7ead5..2a528331b 100644 --- a/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java +++ b/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java @@ -25,6 +25,7 @@ import javax.enterprise.inject.Instance; import javax.enterprise.util.AnnotationLiteral; import javax.faces.bean.RequestScoped; import javax.inject.Inject; +import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -41,7 +42,10 @@ import java.util.Map; * @version created the 03.02.2016 */ @RequestScoped -public class Marshaller { +@Deprecated /*needs to be reviewed when integrating import/export in gui*/ +public class Marshaller implements Serializable { + + private static final long serialVersionUID = 6769177147719834999L; @Inject @Any 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 e082315e1..8df906aa7 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Jens Pelzetter */ @RequestScoped -public class GroupManager { +public class GroupManager implements Serializable { + private static final long serialVersionUID = 8001182420672016296L; @Inject private GroupRepository groupRepository; diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java index e841b2eb5..09e76aad7 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java @@ -33,6 +33,8 @@ import javax.transaction.Transactional; @Marshals(Group.class) public class GroupMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = 5004457104585052013L; + @Inject private GroupRepository groupRepository; diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipIdGenerator.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipIdGenerator.java index 5393ce43a..406681631 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipIdGenerator.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipIdGenerator.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; * @version created on 3/23/17 */ public class GroupMembershipIdGenerator extends ObjectIdGenerator { + private static final long serialVersionUID = 5256221797846627835L; + @Override public Class getScope() { return GroupMembership.class; diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java index e48eef5a5..f6202ce9f 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java @@ -34,6 +34,8 @@ import javax.transaction.Transactional; @Marshals(GroupMembership.class) public class GroupMembershipMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = -1920271635191667015L; + @Inject private EntityManager entityManager; diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java b/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java index dc9d0ddf4..b9b3bc78e 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java @@ -35,6 +35,8 @@ import java.util.Optional; @RequestScoped public class GroupRepository extends AbstractEntityRepository { + private static final long serialVersionUID = 115864505126792697L; + @Override public Class getEntityClass() { return Group.class; diff --git a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java index 0e0578a3d..96d629855 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Jens Pelzetter */ @RequestScoped -public class PermissionManager { +public class PermissionManager implements Serializable { + private static final long serialVersionUID = -6068575941173342106L; private static final Logger LOGGER = LogManager .getLogger(PermissionManager.class); diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java index 6b2dd50ed..afa8e37c0 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java @@ -33,6 +33,7 @@ import javax.transaction.Transactional; @RequestScoped @Marshals(Permission.class) public class PermissionMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = -5145925775270121916L; @Inject private EntityManager entityManager; 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 24731f6c8..5ca343b3f 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionRepository.java @@ -35,6 +35,8 @@ import java.util.Optional; public class PermissionRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -4240674229117593486L; + @Override public Class getEntityClass() { return Permission.class; 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 9bf5b4b58..79cd911fd 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/security/RoleIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Tobias Osmers * @version created on 3/23/17 */ @RequestScoped -public class UserIdResolver implements ObjectIdResolver { +public class UserIdResolver implements Serializable, ObjectIdResolver { + private static final long serialVersionUID = -2541656707906049331L; + @Override public void bindItem(final ObjectIdGenerator.IdKey id, final Object pojo) { diff --git a/ccm-core/src/main/java/org/libreccm/security/UserManager.java b/ccm-core/src/main/java/org/libreccm/security/UserManager.java index 82ae66ba4..22fcbe298 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserManager.java +++ b/ccm-core/src/main/java/org/libreccm/security/UserManager.java @@ -39,6 +39,7 @@ import javax.inject.Inject; import javax.transaction.Transactional; import javax.validation.constraints.NotNull; import javax.validation.executable.ValidateOnExecution; +import java.io.Serializable; /** * Provides various operations for user objects. @@ -47,7 +48,8 @@ import javax.validation.executable.ValidateOnExecution; * @author Jens Pelzetter */ @RequestScoped -public class UserManager { +public class UserManager implements Serializable { + private static final long serialVersionUID = -5457302841422810115L; @Inject private UserRepository userRepository; diff --git a/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java index 280d3f7ff..308a98890 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java @@ -32,6 +32,7 @@ import javax.transaction.Transactional; @RequestScoped @Marshals(User.class) public class UserMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = -7857346915894246160L; @Inject private UserRepository userRepository; diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java index 9b82d0c0a..2ca5c5a4c 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Jens Pelzetter */ @ApplicationScoped -public class ApplicationManager { +public class ApplicationManager implements Serializable { + private static final long serialVersionUID = -4623791386536335252L; private static final Logger LOGGER = LogManager.getLogger( - ApplicationManager.class); + ApplicationManager.class); @Inject private EntityManager entityManager; @@ -60,11 +62,11 @@ public class ApplicationManager { @PostConstruct private void loadApplicationTypes() { final ServiceLoader modules = ServiceLoader.load( - CcmModule.class); + CcmModule.class); for (CcmModule module : modules) { final Module moduleData = module.getClass().getAnnotation( - Module.class); + Module.class); final ApplicationType[] appTypes = moduleData.applicationTypes(); @@ -88,12 +90,12 @@ public class ApplicationManager { @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) @Transactional(Transactional.TxType.REQUIRED) public T createInstance( - final ApplicationType type, - final String path, - final Class applicationClass) throws ApplicationCreateException { + final ApplicationType type, + final String path, + final Class applicationClass) throws ApplicationCreateException { @SuppressWarnings("unchecked") final ApplicationCreator creator = CdiUtil.createCdiUtil().findBean( - type.creator()); + type.creator()); final T application = creator.createInstance(path, type); entityManager.persist(application); @@ -110,7 +112,7 @@ public class ApplicationManager { public CcmApplication findApplicationByPath(final String path) { final TypedQuery query = entityManager.createNamedQuery( - "CcmApplication.retrieveApplicationForPath", CcmApplication.class); + "CcmApplication.retrieveApplicationForPath", CcmApplication.class); query.setParameter("path", path); final List result = query.getResultList(); if (result.isEmpty()) { @@ -129,26 +131,26 @@ public class ApplicationManager { if (type == null) { throw new IllegalArgumentException(String.format( - "Unknown application type \"%s\".", typeName)); + "Unknown application type \"%s\".", typeName)); } if (type.servletPath().isEmpty()) { if (type.servlet().equals(HttpServlet.class)) { throw new IllegalArgumentException(String.format( - "Application type \"%s\" can no servlet path nor a serlet " - + "definition.", - typeName)); + "Application type \"%s\" can no servlet path nor a serlet " + + "definition.", + typeName)); } else { final Class servletClass = type.servlet(); if (servletClass.isAnnotationPresent(WebServlet.class)) { return servletClass.getAnnotation(WebServlet.class) - .urlPatterns()[0]; + .urlPatterns()[0]; } else { throw new IllegalArgumentException(String.format( - "Provided servlet for application type \"%s\" has not " - + "@WebServlet annotation.", - typeName)); + "Provided servlet for application type \"%s\" has not " + + "@WebServlet annotation.", + typeName)); } } } else { @@ -157,7 +159,7 @@ public class ApplicationManager { } public String getApplicationTypeTitle( - final ApplicationType applicationType) { + final ApplicationType applicationType) { final String descBundle; if (Strings.isBlank(applicationType.descBundle())) { @@ -169,7 +171,7 @@ public class ApplicationManager { final ResourceBundle bundle; try { bundle = ResourceBundle.getBundle( - descBundle, globalizationHelper.getNegotiatedLocale()); + descBundle, globalizationHelper.getNegotiatedLocale()); return bundle.getString(applicationType.titleKey()); } catch (MissingResourceException ex) { LOGGER.warn("Failed to find resource bundle '{}'.", ex); @@ -179,7 +181,7 @@ public class ApplicationManager { } public String getApplicationTypeDescription( - final ApplicationType applicationType) { + final ApplicationType applicationType) { final String descBundle; if (Strings.isBlank(applicationType.descBundle())) { @@ -191,7 +193,7 @@ public class ApplicationManager { final ResourceBundle bundle; try { bundle = ResourceBundle.getBundle( - descBundle, globalizationHelper.getNegotiatedLocale()); + descBundle, globalizationHelper.getNegotiatedLocale()); return bundle.getString(applicationType.descKey()); } catch (MissingResourceException ex) { LOGGER.warn("Failed to find resource bundle '{}'.", ex); @@ -201,3 +203,4 @@ public class ApplicationManager { } } + diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationMarshaller.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationMarshaller.java index 523f54aaa..fb4fda852 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationMarshaller.java @@ -31,6 +31,7 @@ import javax.inject.Inject; @RequestScoped @Marshals(CcmApplication.class) public class ApplicationMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = -342978428750991072L; @Inject private ApplicationRepository applicationRepository; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java index 1b6dcbb3b..ca7e938e2 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskIdResolver.java @@ -23,13 +23,17 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Jens Pelzetter */ @RequestScoped -public class AssignableTaskManager { +public class AssignableTaskManager implements Serializable { + private static final long serialVersionUID = -4364893854116452485L; @Inject private EntityManager entityManager; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java index 7a7b27261..bccf07124 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java @@ -32,6 +32,7 @@ import javax.transaction.Transactional; @RequestScoped @Marshals(AssignableTask.class) public class AssignableTaskMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = -2787744872933470651L; @Inject private AssignableTaskRepository assignableTaskRepository; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java index ee45c5d66..bdb99fc84 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskRepository.java @@ -38,6 +38,7 @@ import java.util.stream.Collectors; @RequestScoped public class AssignableTaskRepository extends AbstractEntityRepository { + private static final long serialVersionUID = 2657793145163510103L; @Override public Class getEntityClass() { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentIdGenerator.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentIdGenerator.java index 7638ca250..a1dd22b29 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentIdGenerator.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentIdGenerator.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; * @version created on 3/23/17 */ public class TaskAssignmentIdGenerator extends ObjectIdGenerator { + private static final long serialVersionUID = -5493483256068253010L; + @Override public Class getScope() { return TaskAssignment.class; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java index 0f1bcf81c..691082cb0 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java @@ -33,6 +33,7 @@ import javax.transaction.Transactional; @RequestScoped @Marshals(TaskAssignment.class) public class TaskAssignmentMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = 3717946510122661215L; @Inject private EntityManager entityManager; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java index 6a9ea2330..b7c7b850f 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentIdResolver.java @@ -22,11 +22,15 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerator; import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; +import java.io.Serializable; + /** * @author Tobias Osmers * @version created on 3/23/17 */ @RequestScoped -public class TaskIdResolver implements ObjectIdResolver { +public class TaskIdResolver implements Serializable, ObjectIdResolver { + private static final long serialVersionUID = 6444989953192198987L; + @Override public void bindItem(final ObjectIdGenerator.IdKey id, final Object pojo) { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskManager.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskManager.java index 2c9164ad1..4a117c5ae 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskManager.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskManager.java @@ -26,6 +26,7 @@ import org.libreccm.security.RequiresPrivilege; import org.libreccm.security.Shiro; import org.libreccm.security.User; +import java.io.Serializable; import java.util.List; import javax.enterprise.context.RequestScoped; @@ -46,7 +47,8 @@ import javax.persistence.TypedQuery; * @author Jens Pelzetter */ @RequestScoped -public class TaskManager { +public class TaskManager implements Serializable { + private static final long serialVersionUID = -5605541655413527137L; private static final Logger LOGGER = LogManager.getLogger(TaskManager.class); diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java index 1ca43549a..8bfac828c 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java @@ -34,6 +34,7 @@ import java.util.UUID; */ @RequestScoped public class TaskRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -8366096936911158514L; @Override public Class getEntityClass() { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java index 68b897ae1..4067b3dd9 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowIdResolver.java @@ -23,13 +23,16 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver; import org.libreccm.cdi.utils.CdiUtil; import javax.enterprise.context.RequestScoped; +import java.io.Serializable; /** * @author Jens Pelzetter */ @RequestScoped -public class WorkflowManager { +public class WorkflowManager implements Serializable { + private static final long serialVersionUID = -6939804120313699606L; private final static Logger LOGGER = LogManager.getLogger( WorkflowManager.class); diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java index a15b6edaa..9c284d603 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java @@ -32,6 +32,7 @@ import javax.transaction.Transactional; @RequestScoped @Marshals(Workflow.class) public class WorkflowMarshaller extends AbstractMarshaller { + private static final long serialVersionUID = 9126827334328274556L; @Inject private WorkflowRepository workflowRepository; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java index 8e9dd044e..3108895a4 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowRepository.java @@ -34,6 +34,7 @@ import java.util.UUID; */ @RequestScoped public class WorkflowRepository extends AbstractEntityRepository { + private static final long serialVersionUID = -8811728904958517569L; @Override public Class getEntityClass() { 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 68d2cb010..244008885 100644 --- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java @@ -106,7 +106,6 @@ public class CoreDataImportTest { } public CoreDataImportTest() { - } @BeforeClass