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/transfer/HttpClientTransmitterImpl.java

@@ -120,7 +120,7 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
     /**
      * By default this class uses the standard SSLProtocolSocketFactory, but this method allows this to be overridden.
      * Useful if, for example, one wishes to permit support of self-signed certificates on the target.
-     * @param socketFactory
+     * @param socketFactory ProtocolSocketFactory
      */
     public void setHttpsSocketFactory(ProtocolSocketFactory socketFactory)
     {
@@ -131,7 +131,7 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
      * By default, this class uses a plain HttpClient instance with the only non-default
      * option being the multi-threaded connection manager.
      * Use this method to replace this with your own HttpClient instance configured how you wish
-     * @param httpClient
+     * @param httpClient HttpClient
      */
     public void setHttpClient(HttpClient httpClient)
     {
@@ -140,7 +140,7 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
 
     /**
      * Whether httpClient will use preemptive authentication or not.
-     * @param flag 
+     * @param isAuthenticationPreemptive boolean
      */
     public void setIsAuthenticationPreemptive(boolean isAuthenticationPreemptive)
     {
@@ -182,7 +182,10 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
     }
 
     /**
-     * @param response
+     *
+     * @param methodName String
+     * @param response int
+     * @param method HttpMethod
      */
     private void checkResponseStatus(String methodName, int response, HttpMethod method)
     {
@@ -213,8 +216,8 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
 
     /**
      * Get the HTTPState for a transfer target
-     * @param target
-     * @return
+     * @param target TransferTarget
+     * @return HttpState
      */
     protected HttpState getHttpState(TransferTarget target)
     {
@@ -226,8 +229,8 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
     }
 
     /**
-     * @param target
-     * @return
+     * @param target TransferTarget
+     * @return HostConfiguration
      */
     private HostConfiguration getHostConfig(TransferTarget target)
     {
@@ -742,7 +745,7 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
      * the error message ("errorMessage"), and, optionally, the Alfresco message id ("alfrescoErrorId")
      * and Alfresco message parameters ("alfrescoErrorParams").
      * @return The rehydrated error object, or null if errorJSON is null.
-     * @throws JSONException if an error occurs while parsing the supplied JSON object
+     * Throws {@code JSONException} if an error occurs while parsing the supplied JSON object
      */
     private Throwable rehydrateError(JSONObject errorJSON)
     {