From b6cb76899355af53826c799cbb8c09094a48a82b Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 23 Nov 2015 12:45:16 +0000 Subject: [PATCH] CCM NG: Removed the javabeans PMD ruleset from the list of checked rulesets because the rule "BeanMembersShouldSerialize" from this ruleset procduces many false positives. Also removed also usages of the transient modifier which were only added to various classes to match this rule. git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3743 8810af33-2d31-482b-a856-94f89814c4df --- .../src/main/resources/archetype-resources/pom.xml | 1 - .../src/test/java/__moduleClass__Test.java | 2 +- .../src/main/resources/archetype-resources/pom.xml | 3 +-- ccm-cms-types-agenda/pom.xml | 1 - ccm-cms-types-article/pom.xml | 1 - ccm-cms-types-bookmark/pom.xml | 1 - ccm-cms-types-decisiontree/pom.xml | 1 - ccm-cms-types-event/pom.xml | 1 - ccm-cms-types-minutes/pom.xml | 1 - ccm-cms-types-mparticle/pom.xml | 1 - ccm-cms/pom.xml | 1 - ccm-cms/src/test/java/org/librecms/CmsTest.java | 2 +- ccm-core/pom.xml | 3 +-- .../com/arsdigita/bebop/event/FormSectionEvent.java | 2 +- .../main/java/com/arsdigita/bebop/event/PageEvent.java | 2 +- .../java/com/arsdigita/bebop/event/ParameterEvent.java | 4 ++-- .../java/com/arsdigita/web/CCMDispatcherServlet.java | 2 +- .../auditing/AbstractAuditedEntityRepository.java | 2 +- .../org/libreccm/auditing/CcmRevisionListener.java | 3 --- .../org/libreccm/categorization/CategoryManager.java | 2 +- .../org/libreccm/categorization/DomainManager.java | 2 +- .../org/libreccm/categorization/DomainRepository.java | 2 +- .../src/main/java/org/libreccm/cdi/utils/CdiUtil.java | 2 +- .../org/libreccm/core/AbstractEntityRepository.java | 2 +- .../java/org/libreccm/jpa/AuditReaderProducer.java | 2 +- .../org/libreccm/modules/CcmModuleContextListener.java | 2 +- .../src/main/java/org/libreccm/modules/ModuleInfo.java | 10 +++++----- .../java/org/libreccm/security/PermissionChecker.java | 4 ++-- .../main/java/org/libreccm/web/ApplicationManager.java | 2 +- .../org/libreccm/core/CcmObjectRepositoryTest.java | 4 ++-- .../org/libreccm/jpautils/MimeTypeConverterTest.java | 2 +- .../java/org/libreccm/jpautils/UriConverterTest.java | 2 +- .../modules/DependencyTreeManagerCycleTest.java | 2 +- .../libreccm/modules/DependencyTreeManagerTest.java | 2 +- .../org/libreccm/security/GroupRepositoryTest.java | 4 ++-- .../org/libreccm/security/PartyRepositoryTest.java | 4 ++-- .../org/libreccm/security/PermissionCheckerTest.java | 8 ++++---- .../java/org/libreccm/security/RoleRepositoryTest.java | 4 ++-- .../java/org/libreccm/security/UserRepositoryTest.java | 4 ++-- ccm-docrepo/pom.xml | 1 - .../java/org/libreccm/docrepo/ResourceManager.java | 4 ++-- .../java/org/libreccm/docrepo/ResourceRepository.java | 2 +- ccm-shortcuts/pom.xml | 1 - .../java/org/libreccm/shortcuts/ShortcutManager.java | 2 +- ccm-test-bundle-wildfly8/pom.xml | 1 - .../src/test/java/org/libreccm/CcmModulesTest.java | 2 +- ccm-testutils/pom.xml | 2 -- .../java/org/libreccm/testutils/DatasetsVerifier.java | 2 +- .../java/org/libreccm/testutils/EqualsVerifier.java | 2 +- .../java/org/libreccm/testutils/ToStringVerifier.java | 2 +- 50 files changed, 51 insertions(+), 70 deletions(-) diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml index 289ca5def..df1877e23 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml +++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml @@ -277,7 +277,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java b/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java index 00094b112..7f81102b6 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java +++ b/ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java @@ -46,7 +46,7 @@ import static org.junit.Assert.*; public class ${moduleClass}Test { @PersistenceContext(name = "LibreCCM") - private transient EntityManager entityManager; + private EntityManager entityManager; @BeforeClass public static void setUpClass() { diff --git a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml index 8ab90a480..566922457 100644 --- a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml +++ b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml @@ -285,7 +285,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml @@ -321,4 +320,4 @@ - \ No newline at end of file + diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index c30c6d4fa..f89178c2b 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -287,7 +287,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms-types-article/pom.xml b/ccm-cms-types-article/pom.xml index e099626d1..6be4e1b5c 100644 --- a/ccm-cms-types-article/pom.xml +++ b/ccm-cms-types-article/pom.xml @@ -286,7 +286,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index 25cc3f446..2e5c4c606 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -287,7 +287,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index e9be1bb27..fcb18e2f0 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -287,7 +287,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms-types-event/pom.xml b/ccm-cms-types-event/pom.xml index 62eea7210..9ed9b6854 100644 --- a/ccm-cms-types-event/pom.xml +++ b/ccm-cms-types-event/pom.xml @@ -287,7 +287,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 43dbe88c9..fb4fa00e3 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -287,7 +287,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms-types-mparticle/pom.xml b/ccm-cms-types-mparticle/pom.xml index cfc7d72ef..2849d6da5 100644 --- a/ccm-cms-types-mparticle/pom.xml +++ b/ccm-cms-types-mparticle/pom.xml @@ -287,7 +287,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index de3fdaad8..ba9fc1bd6 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -278,7 +278,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-cms/src/test/java/org/librecms/CmsTest.java b/ccm-cms/src/test/java/org/librecms/CmsTest.java index 183ae1ca6..3f5d2aa7e 100644 --- a/ccm-cms/src/test/java/org/librecms/CmsTest.java +++ b/ccm-cms/src/test/java/org/librecms/CmsTest.java @@ -48,7 +48,7 @@ import static org.junit.Assert.*; public class CmsTest { @PersistenceContext(name = "LibreCCM") - private transient EntityManager entityManager; + private EntityManager entityManager; @BeforeClass public static void setUpClass() { diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 8454e1322..da2d0cbce 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -409,7 +409,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml @@ -1204,4 +1203,4 @@ - \ No newline at end of file + diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/event/FormSectionEvent.java b/ccm-core/src/main/java/com/arsdigita/bebop/event/FormSectionEvent.java index 70996cc30..5b3167c6d 100755 --- a/ccm-core/src/main/java/com/arsdigita/bebop/event/FormSectionEvent.java +++ b/ccm-core/src/main/java/com/arsdigita/bebop/event/FormSectionEvent.java @@ -36,7 +36,7 @@ import com.arsdigita.bebop.PageState; */ public class FormSectionEvent extends PageEvent { - private final transient FormData _formData; + private final FormData _formData; /** * Get the form data for to the form that fired the event in the current diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/event/PageEvent.java b/ccm-core/src/main/java/com/arsdigita/bebop/event/PageEvent.java index 8491849f3..2f3b5ae0c 100755 --- a/ccm-core/src/main/java/com/arsdigita/bebop/event/PageEvent.java +++ b/ccm-core/src/main/java/com/arsdigita/bebop/event/PageEvent.java @@ -34,7 +34,7 @@ import java.util.EventObject; */ public class PageEvent extends EventObject { - private transient PageState _state; + private PageState _state; /** * Construct a new PageEvent. diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/event/ParameterEvent.java b/ccm-core/src/main/java/com/arsdigita/bebop/event/ParameterEvent.java index 96696577d..e76e5998f 100755 --- a/ccm-core/src/main/java/com/arsdigita/bebop/event/ParameterEvent.java +++ b/ccm-core/src/main/java/com/arsdigita/bebop/event/ParameterEvent.java @@ -38,8 +38,8 @@ import java.util.EventObject; public class ParameterEvent extends EventObject { /* The request specific data about the event */ - private transient ParameterData m_data; - private transient PageState m_state; + private ParameterData m_data; + private PageState m_state; /** * Construct a ParameterEvent diff --git a/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java b/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java index a247e000f..59c66aad5 100644 --- a/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java +++ b/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java @@ -65,7 +65,7 @@ public class CCMDispatcherServlet extends BaseServlet { private static String s_contextPath; @Inject - private transient ApplicationRepository appRepository; + private ApplicationRepository appRepository; /** * Servlet initializer uses the extension point of parent class. diff --git a/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java b/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java index 5099e75ea..c65fe2984 100644 --- a/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java +++ b/ccm-core/src/main/java/org/libreccm/auditing/AbstractAuditedEntityRepository.java @@ -35,7 +35,7 @@ public abstract class AbstractAuditedEntityRepository extends AbstractEntityRepository { @Inject - private transient AuditReader auditReader; + private AuditReader auditReader; public abstract K getEntityId(final T entity); diff --git a/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java b/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java index edda54666..1cf3965b0 100644 --- a/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java +++ b/ccm-core/src/main/java/org/libreccm/auditing/CcmRevisionListener.java @@ -29,9 +29,6 @@ import javax.inject.Inject; */ public class CcmRevisionListener implements RevisionListener { -// @Inject -// private transient CcmSessionContext sessionContext; - @Override public void newRevision(final Object revisionEntity) { if (!(revisionEntity instanceof CcmRevision)) { 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 53d6acfb6..aa7fd91e7 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java @@ -36,7 +36,7 @@ public class CategoryManager { * A {@link CategoryRepository} instance used to interact with the database. */ @Inject - private transient CategoryRepository categoryRepo; + private CategoryRepository categoryRepo; /** * Assigns an category to an object. The object is added at the position diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java index 740f2c72a..308566f46 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java @@ -33,7 +33,7 @@ import javax.inject.Inject; public class DomainManager { @Inject - private transient DomainRepository domainRepo; + private DomainRepository domainRepo; /** * Adds a {@code CcmApplication} to the owners of a {@link Domain}. If the diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java index c4dfc7dce..b805dfbcd 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java @@ -35,7 +35,7 @@ import javax.persistence.EntityManager; public class DomainRepository extends AbstractEntityRepository { @Inject - private transient EntityManager entityManager; + private EntityManager entityManager; @Override public Class getEntityClass() { diff --git a/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java b/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java index aaefd91a9..957a2cc1c 100644 --- a/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java +++ b/ccm-core/src/main/java/org/libreccm/cdi/utils/CdiUtil.java @@ -38,7 +38,7 @@ public class CdiUtil { private final static Logger LOGGER = LogManager.getLogger(CdiUtil.class); - private final transient BeanManager beanManager; + private final BeanManager beanManager; public CdiUtil() { beanManager = CDI.current().getBeanManager(); diff --git a/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java b/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java index b7a782d3f..dd1dff3ca 100644 --- a/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/AbstractEntityRepository.java @@ -42,7 +42,7 @@ public abstract class AbstractEntityRepository { * CDI. */ @Inject - private transient EntityManager entityManager; + private EntityManager entityManager; /** * Getter method for retrieving the injected {@link EntityManager}. diff --git a/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java b/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java index 9bd4445de..a3beff037 100644 --- a/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java +++ b/ccm-core/src/main/java/org/libreccm/jpa/AuditReaderProducer.java @@ -32,7 +32,7 @@ import javax.persistence.EntityManager; public class AuditReaderProducer { @Inject - private transient EntityManager entityManager; + private EntityManager entityManager; @Produces public AuditReader auditReader() { diff --git a/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java b/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java index d3f09d326..898270d49 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java @@ -42,7 +42,7 @@ public class CcmModuleContextListener implements ServletContextListener { CcmModuleContextListener.class); @Inject - private transient ModuleManager moduleManager; + private ModuleManager moduleManager; @Override public void contextInitialized(final ServletContextEvent event) { diff --git a/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java index 1c3b1c136..36fcd4795 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java @@ -57,23 +57,23 @@ public class ModuleInfo { /** * The name of the module (artifact id). */ - private transient String moduleName; + private String moduleName; /** * The data package of the module (group id). */ - private transient String moduleDataPackage; + private String moduleDataPackage; /** * The entities provided by the module. */ - private transient Class[] moduleEntities; + private Class[] moduleEntities; /** * The version of the module. */ - private transient String moduleVersion; + private String moduleVersion; /** * The modules required by the described module. */ - private transient RequiredModule[] requiredModules; + private RequiredModule[] requiredModules; public ModuleInfo() { //Nothing diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionChecker.java b/ccm-core/src/main/java/org/libreccm/security/PermissionChecker.java index 5e0ec81ff..380e20a9c 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionChecker.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionChecker.java @@ -38,10 +38,10 @@ public class PermissionChecker { * The current subject as provided by {@link Shiro#getSubject()}. */ @Inject - private transient Subject subject; + private Subject subject; @Inject - private transient Shiro shiro; + private Shiro shiro; /** * Checks if the current subject has a permission granting the provided diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationManager.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationManager.java index 34d1fdd1b..23bef8655 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationManager.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationManager.java @@ -42,7 +42,7 @@ import javax.servlet.http.HttpServlet; public class ApplicationManager { @Inject - private transient EntityManager entityManager; + private EntityManager entityManager; private Map applicationTypes; diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java index 3ca62c3ef..ea567dd2f 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -65,10 +65,10 @@ import static org.junit.Assert.*; public class CcmObjectRepositoryTest { @Inject - private transient CcmObjectRepository ccmObjectRepository; + private CcmObjectRepository ccmObjectRepository; @PersistenceContext(name = "LibreCCM") - private transient EntityManager entityManager; + private EntityManager entityManager; public CcmObjectRepositoryTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/jpautils/MimeTypeConverterTest.java b/ccm-core/src/test/java/org/libreccm/jpautils/MimeTypeConverterTest.java index fbd47ba4d..7af652503 100644 --- a/ccm-core/src/test/java/org/libreccm/jpautils/MimeTypeConverterTest.java +++ b/ccm-core/src/test/java/org/libreccm/jpautils/MimeTypeConverterTest.java @@ -49,7 +49,7 @@ public class MimeTypeConverterTest { public static final String VIDEO_MP4 = "video/mp4"; - private transient MimeTypeConverter mimeTypeConverter; + private MimeTypeConverter mimeTypeConverter; public MimeTypeConverterTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java b/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java index 10aa92060..d1e29b55b 100644 --- a/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java +++ b/ccm-core/src/test/java/org/libreccm/jpautils/UriConverterTest.java @@ -53,7 +53,7 @@ public class UriConverterTest { private static final String HTTP = "http"; private static final String FILE = "file"; - private transient UriConverter uriConverter; + private UriConverter uriConverter; public UriConverterTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java index c2ea1ffc0..8b8d41cd6 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java @@ -58,7 +58,7 @@ import java.util.List; @RunWith(Arquillian.class) public class DependencyTreeManagerCycleTest { - private transient Iterable modules; + private Iterable modules; public DependencyTreeManagerCycleTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java index 2cf90503c..1999a208a 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java @@ -57,7 +57,7 @@ import java.util.List; @RunWith(Arquillian.class) public class DependencyTreeManagerTest { - private transient Iterable modules; + private Iterable modules; public DependencyTreeManagerTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java index bb543f762..8aa8b0a58 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java @@ -74,10 +74,10 @@ public class GroupRepositoryTest { private static final String NONE = "none"; @Inject - private transient GroupRepository groupRepository; + private GroupRepository groupRepository; @PersistenceContext - private transient EntityManager entityManager; + private EntityManager entityManager; public GroupRepositoryTest() { diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java index 6ba5c1114..a4ec1459a 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java @@ -75,10 +75,10 @@ public class PartyRepositoryTest { private static final String MANAGERS = "managers"; @Inject - private transient PartyRepository partyRepository; + private PartyRepository partyRepository; @PersistenceContext - private transient EntityManager entityManager; + private EntityManager entityManager; public PartyRepositoryTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java index 1523eb05c..a0bee6d07 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -79,16 +79,16 @@ import static org.junit.Assert.*; public class PermissionCheckerTest { @Inject - private transient Subject subject; + private Subject subject; @Inject - private transient Shiro shiro; + private Shiro shiro; @Inject - private transient PermissionChecker permissionChecker; + private PermissionChecker permissionChecker; @Inject - private transient CcmObjectRepository objectRepository; + private CcmObjectRepository objectRepository; public PermissionCheckerTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java index f367c4d15..c32ee52c2 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java @@ -72,10 +72,10 @@ public class RoleRepositoryTest { private static final String READER = "reader"; @Inject - private transient RoleRepository roleRepository; + private RoleRepository roleRepository; @PersistenceContext - private transient EntityManager entityManager; + private EntityManager entityManager; public RoleRepositoryTest() { } diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java index d5d63d280..37c4d2157 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java @@ -77,10 +77,10 @@ public class UserRepositoryTest { private static final String JDOE = "jdoe"; @Inject - private transient UserRepository userRepository; + private UserRepository userRepository; @PersistenceContext - private transient EntityManager entityManager; + private EntityManager entityManager; public UserRepositoryTest() { } diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index 4177655d6..a693f5491 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -282,7 +282,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceManager.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceManager.java index 6c29c65af..b59fddf3b 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceManager.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceManager.java @@ -34,7 +34,7 @@ public class ResourceManager { private static final Logger log = Logger.getLogger(ResourceManager.class); @Inject - private transient ResourceRepository resourceRepository; + private ResourceRepository resourceRepository; public void copyToFolder(Resource original, Folder folder) { Resource copy = original.isFolder() ? new Folder() : new File(); @@ -54,4 +54,4 @@ public class ResourceManager { -} \ No newline at end of file +} diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java index accb75197..b1f1e9d87 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceRepository.java @@ -39,7 +39,7 @@ import java.util.List; public class ResourceRepository extends AbstractAuditedEntityRepository { @Inject - private transient EntityManager entityManager; + private EntityManager entityManager; @Override public Long getEntityId(Resource entity) { diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index a411416de..d94f27e11 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -292,7 +292,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutManager.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutManager.java index 2a2b6f723..632a56aab 100644 --- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutManager.java +++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutManager.java @@ -38,7 +38,7 @@ public class ShortcutManager { * {@link ShortcutRepository} for interacting with the database. */ @Inject - private transient ShortcutRepository shortcutRepository; + private ShortcutRepository shortcutRepository; /** * Creates a Shortcut diff --git a/ccm-test-bundle-wildfly8/pom.xml b/ccm-test-bundle-wildfly8/pom.xml index 332edfd91..6bfc6931e 100644 --- a/ccm-test-bundle-wildfly8/pom.xml +++ b/ccm-test-bundle-wildfly8/pom.xml @@ -279,7 +279,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml /rulesets/java/junit.xml /rulesets/java/naming.xml /rulesets/java/optimizations.xml diff --git a/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java b/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java index a7b4f1a21..3986065a1 100644 --- a/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java +++ b/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java @@ -74,7 +74,7 @@ import javax.persistence.TypedQuery; public class CcmModulesTest { @PersistenceContext(name = "LibreCCM") - private transient EntityManager entityManager; + private EntityManager entityManager; public CcmModulesTest() { diff --git a/ccm-testutils/pom.xml b/ccm-testutils/pom.xml index 5b04e986c..382d8b65f 100644 --- a/ccm-testutils/pom.xml +++ b/ccm-testutils/pom.xml @@ -144,8 +144,6 @@ /rulesets/java/empty.xml /rulesets/java/finalizers.xml /rulesets/java/imports.xml - /rulesets/java/javabeans.xml - /rulesets/java/naming.xml /rulesets/java/optimizations.xml /rulesets/java/strictexception.xml diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java index d6954bf44..7717f378e 100644 --- a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java +++ b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java @@ -72,7 +72,7 @@ import java.nio.charset.StandardCharsets; */ public class DatasetsVerifier { - private final transient String datasetPath; + private final String datasetPath; public DatasetsVerifier(final String datasetsPath) { this.datasetPath = datasetsPath; diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java index d32dde961..a325ef7ba 100644 --- a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java +++ b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java @@ -68,7 +68,7 @@ import org.junit.runners.Parameterized; */ public class EqualsVerifier { - private final transient Class entityClass; + private final Class entityClass; public EqualsVerifier(final Class entityClass) { this.entityClass = entityClass; diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/ToStringVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/ToStringVerifier.java index db2fbd169..8ba72660e 100644 --- a/ccm-testutils/src/main/java/org/libreccm/testutils/ToStringVerifier.java +++ b/ccm-testutils/src/main/java/org/libreccm/testutils/ToStringVerifier.java @@ -62,7 +62,7 @@ import java.lang.reflect.Modifier; */ public class ToStringVerifier { - private final transient Class entityClass; + private final Class entityClass; public ToStringVerifier(final Class entityClass) { this.entityClass = entityClass;