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
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -47,13 +47,13 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
/**
* Add or Update OAuth2 Credentials for the current user to the OAuth2
* Credential Store
*
* @param remoteSystemId
* @param accessToken
* @param refreshToken String
* @param expiresAt
* @param issuedAt if null, the current Datetime will be used
* @return OAuth2CredentialsInfo
*
* @param remoteSystemId String
* @param accessToken String
* @param refreshToken String
* @param expiresAt Date
* @param issuedAt if null, the current Datetime will be used
* @return OAuth2CredentialsInfo
*/
@Override
public OAuth2CredentialsInfo storePersonalOAuth2Credentials(String remoteSystemId,
@@ -79,11 +79,11 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
/**
* Add Shared OAuth2 Credentials to the OAuth2 Credential Store
*
* @param remoteSystemId
* @param accessToken
* @param refreshToken
* @param expiresAt
* @param issuedAt
* @param remoteSystemId String
* @param accessToken String
* @param refreshToken String
* @param expiresAt Date
* @param issuedAt Date
* @return OAuth2CredentialsInfo
*/
@Override
@@ -99,12 +99,12 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
}
/**
* @param exisitingCredentials
* @param remoteSystemId
* @param accessToken
* @param refreshToken
* @param expiresAt
* @param issuedAt
* @param exisitingCredentials OAuth2CredentialsInfo
* @param remoteSystemId String
* @param accessToken String
* @param refreshToken String
* @param expiresAt Date
* @param issuedAt Date
* @return OAuth2CredentialsInfo
*/
@Override
@@ -147,11 +147,11 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
}
/**
* @param remoteSystemId
* @param accessToken
* @param refreshToken
* @param expiresAt
* @param issuedAt
* @param remoteSystemId String
* @param accessToken String
* @param refreshToken String
* @param expiresAt Date
* @param issuedAt Date
* @return OAuth2CredentialsInfo
*/
private OAuth2CredentialsInfo buildPersonalOAuth2CredentialsInfo(String remoteSystemId,
@@ -181,11 +181,11 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
}
/**
* @param remoteSystemId
* @param accessToken
* @param refreshToken
* @param expiresAt
* @param issuedAt
* @param remoteSystemId String
* @param accessToken String
* @param refreshToken String
* @param expiresAt Date
* @param issuedAt Date
* @return OAuth2CredentialsInfo
*/
private OAuth2CredentialsInfo buildSharedOAuth2CredentialsInfo(String remoteSystemId,
@@ -211,7 +211,7 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
/**
* Get the current users OAuth2Credentials for the remote systems
*
* @param remoteSystemId
* @param remoteSystemId String
* @return OAuth2CredentialsInfo
*/
@Override
@@ -223,7 +223,7 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
}
/**
* @param remoteSystemId
* @param remoteSystemId String
* @return List<OAuth2CredentialInfo>
*/
@Override
@@ -241,7 +241,7 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
/**
* Delete the current users OAuth2 Credentials for the remote system
*
* @param remoteSystemId
* @param remoteSystemId String
* @return boolean
*/
@Override
@@ -281,9 +281,9 @@ public class OAuth2CredentialsStoreServiceImpl implements OAuth2CredentialsStore
}
/**
* @param succeeded
* @param credentials
* @return
* @param succeeded boolean
* @param credentials OAuth2CredentialsInfo
* @return OAuth2CredentialsInfo
*/
@Override
public OAuth2CredentialsInfo updateCredentialsAuthenticationSucceeded(boolean succeeded,