diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
index f2f29675dd..a3387f7902 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java
@@ -28,6 +28,7 @@
 package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
 
 import java.io.Serializable;
+import java.util.Objects;
 import java.util.Set;
 
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -124,4 +125,24 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra
         // Done
         return sb.toString();
     }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        if (!super.equals(o))
+            return false;
+        AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o;
+        return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
+            && Objects.equals(filePlanRoleService, that.filePlanRoleService);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(nodeService, filePlanService, filePlanRoleService);
+    }
 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
index 2847504a6e..698236b92c 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java
@@ -28,6 +28,7 @@
 package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.audit.extractor.AbstractDataExtractor;
@@ -76,4 +77,23 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor
         // Done
         return identifier;
     }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        if (!super.equals(o))
+            return false;
+        FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o;
+        return Objects.equals(nodeService, that.nodeService);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(nodeService);
+    }
 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
index a0adcd0a68..70e1c546fd 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -126,4 +127,24 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
 
         return extractedData;
     }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        if (!super.equals(o))
+            return false;
+        FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o;
+        return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
+            && Objects.equals(ruleService, that.ruleService);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(nodeService, filePlanService, ruleService);
+    }
 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
index 6e536d1811..006988b06c 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java
@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
@@ -112,4 +113,24 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto
 
         return extractedData;
     }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        if (!super.equals(o))
+            return false;
+        FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o;
+        return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService)
+            && Objects.equals(ruleService, that.ruleService);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(nodeService, filePlanService, ruleService);
+    }
 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
index 264915f9c6..8a959bd593 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
@@ -98,6 +98,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
 
     public void afterPropertiesSet()
     {
+        //Do nothing
     }
 
     /**
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
index bfe7ae2f58..f43b3181ee 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
@@ -284,6 +284,10 @@ public class RMEntryVoter extends RMSecurityCommon
 		                {
 		                    break;
 		                }
+                        default:
+                        {
+                            //do nothing
+                        }
 	                }
 	            }
 	            else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM))
@@ -317,6 +321,10 @@ public class RMEntryVoter extends RMSecurityCommon
 		                {
 		                    break;
 		                }
+		                default:
+                        {
+                            //do nothing
+                        }
 	                }
 	            }
 	        }
@@ -385,6 +393,7 @@ public class RMEntryVoter extends RMSecurityCommon
      */
     public void afterPropertiesSet()
     {
+        //Do nothing
     }
 
     /**
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
index eec7f3db4e..adff94ce9b 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
@@ -118,7 +118,7 @@ public class DispositionScheduleImpl implements DispositionSchedule,
                 {
                     return value.booleanValue();
                 }
-                return null;
+                return false;
             }
         });
     }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java
index 8619a42c99..cd35c889ff 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java
@@ -48,6 +48,7 @@ public class RecordCategoryChild extends RMNode
 
     public RecordCategoryChild()
     {
+        //Default constructor
     }
 
     public Boolean getIsRecordCategory()
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java
index 124896d6a5..bc810cbb45 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java
@@ -39,6 +39,7 @@ public class TargetContainer
 
     public TargetContainer()
     {
+        //Default constructor
     }
 
     public String getTargetParentId()
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java
index 57a5eb34f7..2bd605ee06 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java
@@ -67,6 +67,7 @@ public class Transfer
 
     public Transfer()
     {
+        //Default constructor
     }
 
     @JsonProperty ("id")
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java
index 812107c990..8f2ef1d3e7 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java
@@ -45,6 +45,7 @@ public class TransferChild extends RMNode
 
     public TransferChild()
     {
+        //Default constructor
     }
 
     public Boolean getIsClosed()
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java
index 77677120d4..e51e7948c7 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java
@@ -60,6 +60,7 @@ public class TransferContainer
 
     public TransferContainer()
     {
+        //Default constructor
     }
 
     @JsonProperty ("id")
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java
index 6be0c21d74..72282d6279 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java
@@ -72,7 +72,7 @@ public enum SortDirection
 
         if (sortDirection == null)
         {
-            throw new AlfrescoRuntimeException("Sort direction '" + sortDirection +"' unknown.");
+            throw new AlfrescoRuntimeException("Sort direction unknown.");
         }
 
         return sortDirection;