Reduce number of compilation warnings and re-format where nessesary.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevel.java

@@ -31,6 +31,9 @@ import org.springframework.extensions.surf.util.I18NUtil;
  */
 public final class ClassificationLevel implements Serializable
 {
+    /** serial version uid */
+    private static final long serialVersionUID = -3375064867090476422L;
+    
     private final String id;
     private final String displayLabelKey;
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceException.java

@@ -28,12 +28,18 @@ import org.alfresco.error.AlfrescoRuntimeException;
  */
 public class ClassificationServiceException extends AlfrescoRuntimeException
 {
+    /** serial version uid */
+    private static final long serialVersionUID = -7097573558438226725L;
+
     public ClassificationServiceException(String msgId) { super(msgId); }
     public ClassificationServiceException(String msgId, Throwable cause) { super(msgId, cause); }
 
     /** Represents a fatal error due to missing required configuration. */
     public static class MissingConfiguration extends ClassificationServiceException
     {
+        /** serial version uid */
+        private static final long serialVersionUID = -750162955179494445L;
+
         public MissingConfiguration(String msgId) { super(msgId); }
     }
 
@@ -41,6 +47,9 @@ public class ClassificationServiceException extends AlfrescoRuntimeException
      *  The configuration was understood by the server, but was rejected as illegal. */
     public static class IllegalConfiguration extends ClassificationServiceException
     {
+        /** serial version uid */
+        private static final long serialVersionUID = -1139626996782741741L;
+
         public IllegalConfiguration(String msgId) { super(msgId); }
     }
 
@@ -48,6 +57,9 @@ public class ClassificationServiceException extends AlfrescoRuntimeException
      *  The configuration could not be understood by the server. */
     public static class MalformedConfiguration extends ClassificationServiceException
     {
+        /** serial version uid */
+        private static final long serialVersionUID = 8191162359241035026L;
+        
         public MalformedConfiguration(String msgId) { super(msgId); }
         public MalformedConfiguration(String msgId, Throwable cause) { super(msgId, cause); }
     }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImpl.java

@@ -36,10 +36,10 @@ import org.slf4j.LoggerFactory;
 public class ClassificationServiceImpl extends ServiceBaseImpl
                                        implements ClassificationService
 {
-    private static final String[] LEVELS_KEY = new String[] { "org.alfresco",
+    private static final Serializable[] LEVELS_KEY = new String[] { "org.alfresco",
                                                               "module.org_alfresco_module_rm",
                                                               "classification.levels" };
-    private static final String[] REASONS_KEY = new String[] { "org.alfresco",
+    private static final Serializable[] REASONS_KEY = new String[] { "org.alfresco",
                                                                "module.org_alfresco_module_rm",
                                                                "classification.reasons" };
     private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationServiceImpl.class); 

rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java

@@ -19,7 +19,6 @@
 package org.alfresco.module.org_alfresco_module_rm.test.util;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
@@ -54,7 +53,6 @@ import org.alfresco.module.org_alfresco_module_rm.util.TransactionalResourceHelp
 import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.policy.PolicyComponent;
-import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.security.permissions.impl.ExtendedPermissionService;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;

rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java

@@ -32,6 +32,9 @@ public class ExceptionUtils
     /** This represents a situation where a throwable of an unexpected type was thrown. */
     public static class UnexpectedThrowableException extends RuntimeException
     {
+        /** serial version uid */
+        private static final long serialVersionUID = 3900164716673246207L;
+        
         private final Class<? extends Throwable> expected;
         private final Throwable                  actual;
 
@@ -54,6 +57,9 @@ public class ExceptionUtils
     /** This represents a situation where an expected throwable was not thrown. */
     public static class MissingThrowableException extends RuntimeException
     {
+        /** serial version uid */
+        private static final long serialVersionUID = -988022536370047222L;
+        
         private final Class<? extends Throwable> expected;
 
         public MissingThrowableException(Class<? extends Throwable> expected)
@@ -121,6 +127,7 @@ public class ExceptionUtils
      * @throws UnexpectedThrowableException if a non-matching throwable was thrown out of the code block.
      * @throws MissingThrowableException if the expected throwable was not thrown out of the code block.
      */
+    @SuppressWarnings("unchecked")
     public static <R, T extends Throwable> T expectedException(final Class<T> expected, final Supplier<R> code)
     {
         // The code block may throw an exception or it may not.