Removed warnings from rm-server code

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

rm-server/source/java/org/alfresco/repo/model/filefolder/ExtendedFileFolderServiceImpl.java

@@ -23,20 +23,7 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
     @Override
     public FileInfo create(NodeRef parentNodeRef, String name, QName typeQName)
     {
-        FileInfo result = null;
+        return create(parentNodeRef, name, typeQName, null);
-
-        recordService.disablePropertyEditableCheck();
-        try
-        {
-            result = super.create(parentNodeRef, name, typeQName);
-        }
-        finally
-        {
-            recordService.enablePropertyEditableCheck();
-            recordService.disablePropertyEditableCheck(result.getNodeRef());
-        }
-
-        return result;
     }
 
     @Override
@@ -52,8 +39,11 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
         finally
         {
             recordService.enablePropertyEditableCheck();
+            if (result != null)
+            {
                 recordService.disablePropertyEditableCheck(result.getNodeRef());
             }
+        }
 
         return result;
     }

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DataLoadSystemTest.java

@@ -146,6 +146,7 @@ public class DataLoadSystemTest
                // create content and declare as record
                repeatInTransactionBatches(new RunAsWork<Void>()
                {
+                  @SuppressWarnings("null")
                   public Void doWork() throws Exception
                   {
                       // create document

rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImplUnitTest.java

@@ -20,13 +20,13 @@ package org.alfresco.module.org_alfresco_module_rm.version;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyMap;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.anyString;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -38,7 +38,6 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
 import org.alfresco.repo.version.Version2Model;
-import org.alfresco.repo.version.VersionMigrator;
 import org.alfresco.repo.version.VersionModel;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -70,7 +69,6 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
     private Map<String, Serializable> versionProperties;
 
     /** mocked services */
-    private @Mock(name="versionMigrator") VersionMigrator mockedVersionMigrator;
     private @Mock(name="dbNodeService")   NodeService mockedDbNodeService;
 
     /** recordable version service */