release 1.4.0 (#195)

 doc update

Author: SomkaPe

README.md

@@ -1,4 +1,3 @@
-[![Stories in Ready](https://badge.waffle.io/AzureAD/azure-activedirectory-library-for-java.png?label=ready&title=Ready)](https://waffle.io/AzureAD/azure-activedirectory-library-for-java)
 [![Javadocs](http://javadoc.io/badge/com.microsoft.azure/adal4j.svg)](http://javadoc.io/doc/com.microsoft.azure/adal4j)
 </br>
 # Microsoft Azure Active Directory Authentication Library (ADAL) for Java
@@ -45,4 +44,6 @@ For log which might contains Pii(personally identifiable information) class name
 So, for the same class, for instance Foo, we define two loggers:
 
 com.microsoft.aad.adal4j.Foo - no Pii data
+
 adal4jPii.com.microsoft.aad.adal4j.Foo - might contain Pii data
+

src/main/java/com/microsoft/aad/adal4j/AuthenticationContext.java

@@ -214,22 +214,18 @@ private Callable<AuthenticationResult> init(
     }
 
     /**
-     * Acquires a security token from the authority using a Refresh Token
-     * previously received.
+     * Acquires a security token from the authority using a username/password flow.
      *
      * @param clientId
      *            Name or ID of the client requesting the token.
      * @param resource
      *            Identifier of the target resource that is the recipient of the
-     *            requested token. If null, token is requested for the same
-     *            resource refresh token was originally issued for. If passed,
-     *            resource should match the original resource used to acquire
-     *            refresh token unless token service supports refresh token for
-     *            multiple resources.
+     *            requested token.
      * @param username
      *            Username of the managed or federated user.
      * @param password
      *            Password of the managed or federated user.
+     *            If null, integrated authentication will be used.
      * @param callback
      *            optional callback object for non-blocking execution.
      * @return A {@link Future} object representing the
@@ -253,7 +249,7 @@ public Future<AuthenticationResult> acquireToken(final String resource,
 
         ClientAuthenticationPost clientAuth = new ClientAuthenticationPost(ClientAuthenticationMethod.NONE, new ClientID(clientId));
 
-        if (!StringHelper.isBlank(password)) {
+        if (password != null) {
             return this.acquireToken(new AdalAuthorizatonGrant(
                     new ResourceOwnerPasswordCredentialsGrant(username, new Secret(
                             password)), resource), clientAuth, callback);

src/samples/web-app-samples-for-adal4j/src/main/java/com/microsoft/aad/adal4jsample/AadController.java

@@ -199,7 +199,7 @@ public String getATForCaProtectedApiUsingOboService(ModelMap model, HttpServletR
                 ClientCredential oboCredential = new ClientCredential(oboClientId, oboClientSecret);
 
                 future = context.acquireToken(caProtectedApiIdUri,
-                        new ClientAssertion(result.getAccessToken()), oboCredential, null);
+                        new UserAssertion(result.getAccessToken()), oboCredential, null);
 
                 result = future.get();