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
pull/2/head
jensp 2015-11-23 12:45:16 +00:00
parent 97899ace54
commit b6cb768993
50 changed files with 51 additions and 70 deletions

View File

@ -277,7 +277,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -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() {

View File

@ -285,7 +285,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -287,7 +287,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -286,7 +286,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -287,7 +287,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -287,7 +287,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -287,7 +287,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -287,7 +287,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -287,7 +287,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -278,7 +278,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -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() {

View File

@ -409,7 +409,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -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

View File

@ -34,7 +34,7 @@ import java.util.EventObject;
*/
public class PageEvent extends EventObject {
private transient PageState _state;
private PageState _state;
/**
* Construct a new <code>PageEvent</code>.

View File

@ -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 <code>ParameterEvent</code>

View File

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

View File

@ -35,7 +35,7 @@ public abstract class AbstractAuditedEntityRepository<K, T>
extends AbstractEntityRepository<K, T> {
@Inject
private transient AuditReader auditReader;
private AuditReader auditReader;
public abstract K getEntityId(final T entity);

View File

@ -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)) {

View File

@ -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

View File

@ -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

View File

@ -35,7 +35,7 @@ import javax.persistence.EntityManager;
public class DomainRepository extends AbstractEntityRepository<Long, Domain> {
@Inject
private transient EntityManager entityManager;
private EntityManager entityManager;
@Override
public Class<Domain> getEntityClass() {

View File

@ -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();

View File

@ -42,7 +42,7 @@ public abstract class AbstractEntityRepository<K, E> {
* CDI.
*/
@Inject
private transient EntityManager entityManager;
private EntityManager entityManager;
/**
* Getter method for retrieving the injected {@link EntityManager}.

View File

@ -32,7 +32,7 @@ import javax.persistence.EntityManager;
public class AuditReaderProducer {
@Inject
private transient EntityManager entityManager;
private EntityManager entityManager;
@Produces
public AuditReader auditReader() {

View File

@ -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) {

View File

@ -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

View File

@ -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

View File

@ -42,7 +42,7 @@ import javax.servlet.http.HttpServlet;
public class ApplicationManager {
@Inject
private transient EntityManager entityManager;
private EntityManager entityManager;
private Map<String, ApplicationType> applicationTypes;

View File

@ -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() {
}

View File

@ -49,7 +49,7 @@ public class MimeTypeConverterTest {
public static final String VIDEO_MP4
= "video/mp4";
private transient MimeTypeConverter mimeTypeConverter;
private MimeTypeConverter mimeTypeConverter;
public MimeTypeConverterTest() {
}

View File

@ -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() {
}

View File

@ -58,7 +58,7 @@ import java.util.List;
@RunWith(Arquillian.class)
public class DependencyTreeManagerCycleTest {
private transient Iterable<CcmModule> modules;
private Iterable<CcmModule> modules;
public DependencyTreeManagerCycleTest() {
}

View File

@ -57,7 +57,7 @@ import java.util.List;
@RunWith(Arquillian.class)
public class DependencyTreeManagerTest {
private transient Iterable<CcmModule> modules;
private Iterable<CcmModule> modules;
public DependencyTreeManagerTest() {
}

View File

@ -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() {

View File

@ -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() {
}

View File

@ -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() {
}

View File

@ -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() {
}

View File

@ -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() {
}

View File

@ -282,7 +282,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -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();

View File

@ -39,7 +39,7 @@ import java.util.List;
public class ResourceRepository extends AbstractAuditedEntityRepository<Long, Resource> {
@Inject
private transient EntityManager entityManager;
private EntityManager entityManager;
@Override
public Long getEntityId(Resource entity) {

View File

@ -292,7 +292,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -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

View File

@ -279,7 +279,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<ruleset>/rulesets/java/junit.xml</ruleset>
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>

View File

@ -74,7 +74,7 @@ import javax.persistence.TypedQuery;
public class CcmModulesTest {
@PersistenceContext(name = "LibreCCM")
private transient EntityManager entityManager;
private EntityManager entityManager;
public CcmModulesTest() {

View File

@ -144,8 +144,6 @@
<ruleset>/rulesets/java/empty.xml</ruleset>
<ruleset>/rulesets/java/finalizers.xml</ruleset>
<ruleset>/rulesets/java/imports.xml</ruleset>
<ruleset>/rulesets/java/javabeans.xml</ruleset>
<!--<ruleset>/rulesets/java/junit.xml</ruleset>-->
<ruleset>/rulesets/java/naming.xml</ruleset>
<ruleset>/rulesets/java/optimizations.xml</ruleset>
<ruleset>/rulesets/java/strictexception.xml</ruleset>

View File

@ -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;

View File

@ -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;

View File

@ -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;