Merge pull request #67 from AzureAD/sagonzal/makeAllAPIsFluent

Upate to use fluent API

Author: sangonzal

src/main/java/com/microsoft/aad/msal4j/ADFSAuthority.java

@@ -1,3 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 package com.microsoft.aad.msal4j;
 
 import java.net.URL;

src/main/java/com/microsoft/aad/msal4j/AcquireTokenByAuthorizationGrantSupplier.java

@@ -94,10 +94,10 @@ private OAuthAuthorizationGrant processPasswordGrant(
 
         if (userDiscoveryResponse.isAccountFederated()) {
             WSTrustResponse response = WSTrustRequest.execute(
-                    userDiscoveryResponse.getFederationMetadataUrl(),
+                    userDiscoveryResponse.federationMetadataUrl(),
                     grant.getUsername(),
                     grant.getPassword().getValue(),
-                    userDiscoveryResponse.getCloudAudienceUrn(),
+                    userDiscoveryResponse.cloudAudienceUrn(),
                     msalRequest.requestContext(),
                     this.clientApplication.getServiceBundle(),
                     this.clientApplication.logPii());
@@ -136,10 +136,10 @@ private AuthorizationGrant getAuthorizationGrantIntegrated(String userName) thro
                 this.clientApplication.getServiceBundle());
 
         if (userRealmResponse.isAccountFederated() &&
-                "WSTrust".equalsIgnoreCase(userRealmResponse.getFederationProtocol())) {
+                "WSTrust".equalsIgnoreCase(userRealmResponse.federationProtocol())) {
 
-            String mexURL = userRealmResponse.getFederationMetadataUrl();
-            String cloudAudienceUrn = userRealmResponse.getCloudAudienceUrn();
+            String mexURL = userRealmResponse.federationMetadataUrl();
+            String cloudAudienceUrn = userRealmResponse.cloudAudienceUrn();
 
             // Discover the policy for authentication using the Metadata Exchange Url.
             // Get the WSTrust Token (Web Service Trust Token)

src/main/java/com/microsoft/aad/msal4j/AcquireTokenByDeviceCodeFlowSupplier.java

@@ -78,7 +78,7 @@ private AuthenticationResult acquireTokenWithDeviceCode(DeviceCode deviceCode,
             try {
                 return acquireTokenByAuthorisationGrantSupplier.execute();
             } catch (AuthenticationException ex) {
-                if (ex.getErrorCode().equals(AUTHORIZATION_PENDING)) {
+                if (ex.errorCode().equals(AUTHORIZATION_PENDING)) {
                     TimeUnit.SECONDS.sleep(deviceCode.interval());
                 } else {
                     throw ex;

src/main/java/com/microsoft/aad/msal4j/AppMetadataCacheEntity.java

@@ -1,3 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 package com.microsoft.aad.msal4j;
 
 import com.google.gson.annotations.SerializedName;

src/main/java/com/microsoft/aad/msal4j/AsymmetricKeyCredential.java

@@ -40,14 +40,26 @@
 import java.security.interfaces.RSAPrivateKey;
 import java.util.Enumeration;
 
+import lombok.Getter;
+import lombok.experimental.Accessors;
 import org.apache.commons.codec.binary.Base64;
 
 /**
  * Credential type containing X509 public certificate and RSA private key.
  */
 public final class AsymmetricKeyCredential implements IClientCredential{
+
     public final static int MIN_KEY_SIZE_IN_BITS = 2048;
+
+    /**
+     * Returns private key of the credential.
+     *
+     * @return private key.
+     */
+    @Accessors(fluent = true)
+    @Getter
     private final PrivateKey key;
+
     private final X509Certificate publicCertificate;
 
     /**
@@ -113,18 +125,10 @@ public String getPublicCertificateHash()
      * @return base64 encoded string
      * @throws CertificateEncodingException if an encoding error occurs
      */
-    public String getPublicCertificate() throws CertificateEncodingException {
+    public String publicCertificate() throws CertificateEncodingException {
         return Base64.encodeBase64String(this.publicCertificate.getEncoded());
     }
 
-    /**
-     * Returns private key of the credential.
-     * 
-     * @return private key.
-     */
-    public PrivateKey getKey() {
-        return key;
-    }
 
     /**
      * Static method to create KeyCredential instance.
@@ -174,5 +178,4 @@ private static byte[] getHash(final byte[] inputBytes) throws NoSuchAlgorithmExc
         md.update(inputBytes);
         return md.digest();
     }
-
 }

src/main/java/com/microsoft/aad/msal4j/AuthenticationException.java

@@ -23,13 +23,18 @@
 
 package com.microsoft.aad.msal4j;
 
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
 /**
  * MSAL generic exception class
  */
 public class AuthenticationException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
 
+    @Accessors(fluent = true)
+    @Getter
     private AuthenticationErrorCode errorCode;
 
     /**
@@ -68,8 +73,4 @@ public AuthenticationException(final String message, final Throwable t) {
 
         this.errorCode = AuthenticationErrorCode.UNKNOWN;
     }
-
-    public AuthenticationErrorCode getErrorCode() {
-        return errorCode;
-    }
 }

src/main/java/com/microsoft/aad/msal4j/AuthenticationResultSupplier.java

@@ -84,7 +84,7 @@ public IAuthenticationResult get() {
                 }
             } catch(Exception ex) {
                 if (ex instanceof AuthenticationException) {
-                    apiEvent.setApiErrorCode(((AuthenticationException) ex).getErrorCode());
+                    apiEvent.setApiErrorCode(((AuthenticationException) ex).errorCode());
                 }
                 clientApplication.log.error(
                         LogHelper.createMessage(

src/main/java/com/microsoft/aad/msal4j/Authority.java

@@ -1,3 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 package com.microsoft.aad.msal4j;
 
 import lombok.AccessLevel;

src/main/java/com/microsoft/aad/msal4j/B2CAuthority.java

@@ -1,3 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 package com.microsoft.aad.msal4j;
 
 import lombok.AccessLevel;

src/main/java/com/microsoft/aad/msal4j/ClaimsChallengeException.java

@@ -23,11 +23,21 @@
 
 package com.microsoft.aad.msal4j;
 
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
 /**
  * The exception type thrown when a claims challenge error occurs during token acquisition.
  */
 public class ClaimsChallengeException extends AuthenticationException {
 
+    /**
+     * claims challenge value
+     */
+    @Accessors(fluent = true)
+    @Getter
+    private final String claims;
+
     /**
      * Constructor
      *
@@ -39,14 +49,4 @@ public ClaimsChallengeException(String message, String claims) {
 
         this.claims = claims;
     }
-
-    private final String claims;
-
-    /**
-     *
-     * @return claims challenge value
-     */
-    public String getClaims() {
-        return claims;
-    }
 }

src/main/java/com/microsoft/aad/msal4j/ClientAssertion.java

@@ -24,18 +24,22 @@
 package com.microsoft.aad.msal4j;
 
 import com.nimbusds.oauth2.sdk.auth.JWTAuthentication;
-import java.util.Objects;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.Accessors;
 
 /***
  * Credential type containing an assertion of type
  * "urn:ietf:params:oauth:token-type:jwt".
  */
+@Accessors(fluent = true)
+@Getter
+@EqualsAndHashCode
 public final class ClientAssertion {
 
+    public static final String assertionType = JWTAuthentication.CLIENT_ASSERTION_TYPE;
     private final String assertion;
 
-    private static final String assertionType = JWTAuthentication.CLIENT_ASSERTION_TYPE;
-
     /**
      * Constructor to create credential with a jwt token encoded as a base64 url
      * encoded string.
@@ -50,37 +54,4 @@ public ClientAssertion(final String assertion) {
 
         this.assertion = assertion;
     }
-
-    public String getAssertion() {
-        return assertion;
-    }
-
-    public String getAssertionType() {
-        return assertionType;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 97 * hash + Objects.hashCode(this.assertion);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ClientAssertion other = (ClientAssertion) obj;
-        if (!Objects.equals(this.assertion, other.assertion)) {
-            return false;
-        }
-        return true;
-    }
 }

src/main/java/com/microsoft/aad/msal4j/ClientSecret.java

@@ -23,13 +23,23 @@
 
 package com.microsoft.aad.msal4j;
 
-import java.util.Objects;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
 
 /**
  * Credential including secret.
  */
+@EqualsAndHashCode
 public final class ClientSecret implements IClientCredential {
 
+    /**
+     * Gets the secret of the client requesting the token.
+     *
+     */
+    @Accessors(fluent = true)
+    @Getter
     private final String clientSecret;
 
     /**
@@ -45,38 +55,4 @@ public ClientSecret(final String clientSecret) {
 
         this.clientSecret = clientSecret;
     }
-
-    /**
-     * Gets the secret of the client requesting the token.
-     * 
-     * @return string client secret value
-     */
-    public String getClientSecret() {
-        return clientSecret;
-    }
-    
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 71 * hash + Objects.hashCode(this.clientSecret);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ClientSecret other = (ClientSecret) obj;
-        if (!Objects.equals(this.clientSecret, other.clientSecret)) {
-            return false;
-        }
-        return true;
-    }    
 }