Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


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

source/java/org/alfresco/repo/rating/RatingServiceImpl.java

@@ -320,12 +320,12 @@ public class RatingServiceImpl implements RatingService
         return convertNodeRefToRating(user, ratingNodeAssoc.getChildRef());
     }
 
-    /**
-     * This method converts a NodeRef (which must be an instance of a cm:rating node)
-     * into a {@link Rating} object.
-     * @param user
-     * @param ratingNode
-     * @return
+    /**
+     * This method converts a NodeRef (which must be an instance of a cm:rating node)
+     * into a {@link Rating} object.
+     * @param user String
+     * @param ratingNode NodeRef
+     * @return Rating
      */
     private Rating convertNodeRefToRating(String user, NodeRef ratingNode)
     {
@@ -449,7 +449,7 @@ public class RatingServiceImpl implements RatingService
      * @param user the user name of the user whose ratings are sought, <code>null</code>
      *             for all users.
      * @param ratingSchemeName the name of the rating scheme, <code>null</code> for all schemes.
-     * @return
+     * @return List<ChildAssociationRef>
      */
     List<ChildAssociationRef> getRatingNodeChildren(NodeRef targetNode,
             String ratingSchemeName, String user)
@@ -462,8 +462,8 @@ public class RatingServiceImpl implements RatingService
     
     /**
      * This method returns a {@link Rating} object for the specified cm:rating node.
-     * @param ratingNode
-     * @return
+     * @param ratingNode NodeRef
+     * @return Rating
      */
     Rating getRatingFrom(NodeRef ratingNode)
     {