Merge pull request #919 from AzureAD/avdunn/delombok

Remove Lombok from several Parameters classes

Author: Avery-Dunn

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AppTokenProviderParameters.java

@@ -3,15 +3,8 @@
 
 package com.microsoft.aad.msal4j;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
 import java.util.Set;
 
-@Getter
-@Setter
-@AllArgsConstructor
 /// The authentication parameters provided to the app token provider callback.
 public class AppTokenProviderParameters {
 
@@ -23,4 +16,43 @@ public class AppTokenProviderParameters {
     public String claims;
     /// tenant id
     public String tenantId;
+
+    public AppTokenProviderParameters(Set<String> scopes, String correlationId, String claims, String tenantId) {
+        this.scopes = scopes;
+        this.correlationId = correlationId;
+        this.claims = claims;
+        this.tenantId = tenantId;
+    }
+
+    public Set<String> getScopes() {
+        return this.scopes;
+    }
+
+    public String getCorrelationId() {
+        return this.correlationId;
+    }
+
+    public String getClaims() {
+        return this.claims;
+    }
+
+    public String getTenantId() {
+        return this.tenantId;
+    }
+
+    public void setScopes(Set<String> scopes) {
+        this.scopes = scopes;
+    }
+
+    public void setCorrelationId(String correlationId) {
+        this.correlationId = correlationId;
+    }
+
+    public void setClaims(String claims) {
+        this.claims = claims;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
 }

msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AuthorizationCodeParameters.java

@@ -3,70 +3,50 @@
 
 package com.microsoft.aad.msal4j;
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 import java.net.URI;
 import java.util.Map;
 import java.util.Set;
 
 import static com.microsoft.aad.msal4j.ParameterValidationUtils.validateNotBlank;
+import static com.microsoft.aad.msal4j.ParameterValidationUtils.validateNotNull;
 
 /**
  * Object containing parameters for authorization code flow. Can be used as parameter to
  * {@link PublicClientApplication#acquireToken(AuthorizationCodeParameters)} or to
  * {@link ConfidentialClientApplication#acquireToken(AuthorizationCodeParameters)}
  */
-@Builder
-@Accessors(fluent = true)
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class AuthorizationCodeParameters implements IAcquireTokenParameters {
 
-    /**
-     * Authorization code acquired in the first step of OAuth2.0 authorization code flow. For more
-     * details, see https://aka.ms/msal4j-authorization-code-flow
-     */
-    @NonNull
     private String authorizationCode;
 
-    /**
-     * Redirect URI registered in the Azure portal, and which was used in the first step of OAuth2.0
-     * authorization code flow. For more details, see https://aka.ms/msal4j-authorization-code-flow
-     */
-    @NonNull
     private URI redirectUri;
 
-    /**
-     * Scopes to which the application is requesting access
-     */
     private Set<String> scopes;
 
-    /**
-     * Claims to be requested through the OIDC claims request parameter, allowing requests for standard and custom claims
-     */
     private ClaimsRequest claims;
 
-    /**
-     * Code verifier used for PKCE. For more details, see https://tools.ietf.org/html/rfc7636
-     */
     private String codeVerifier;
 
-    /**
-     * Adds additional headers to the token request
-     */
     private Map<String, String> extraHttpHeaders;
 
-    /**
-     * Adds additional query parameters to the token request
-     */
     private Map<String, String> extraQueryParameters;
 
-    /**
-     * Overrides the tenant value in the authority URL for this request
-     */
     private String tenant;
 
+    private AuthorizationCodeParameters(String authorizationCode, URI redirectUri,
+                                        Set<String> scopes, ClaimsRequest claims,
+                                        String codeVerifier, Map<String, String> extraHttpHeaders,
+                                        Map<String, String> extraQueryParameters, String tenant) {
+        this.authorizationCode = authorizationCode;
+        this.redirectUri = redirectUri;
+        this.scopes = scopes;
+        this.claims = claims;
+        this.codeVerifier = codeVerifier;
+        this.extraHttpHeaders = extraHttpHeaders;
+        this.extraQueryParameters = extraQueryParameters;
+        this.tenant = tenant;
+    }
+
     private static AuthorizationCodeParametersBuilder builder() {
 
         return new AuthorizationCodeParametersBuilder();
@@ -87,4 +67,132 @@ public static AuthorizationCodeParametersBuilder builder(String authorizationCod
                 .authorizationCode(authorizationCode)
                 .redirectUri(redirectUri);
     }
+
+    public String authorizationCode() {
+        return this.authorizationCode;
+    }
+
+    public URI redirectUri() {
+        return this.redirectUri;
+    }
+
+    public Set<String> scopes() {
+        return this.scopes;
+    }
+
+    public ClaimsRequest claims() {
+        return this.claims;
+    }
+
+    public String codeVerifier() {
+        return this.codeVerifier;
+    }
+
+    public Map<String, String> extraHttpHeaders() {
+        return this.extraHttpHeaders;
+    }
+
+    public Map<String, String> extraQueryParameters() {
+        return this.extraQueryParameters;
+    }
+
+    public String tenant() {
+        return this.tenant;
+    }
+
+    public static class AuthorizationCodeParametersBuilder {
+        private String authorizationCode;
+        private URI redirectUri;
+        private Set<String> scopes;
+        private ClaimsRequest claims;
+        private String codeVerifier;
+        private Map<String, String> extraHttpHeaders;
+        private Map<String, String> extraQueryParameters;
+        private String tenant;
+
+        AuthorizationCodeParametersBuilder() {
+        }
+
+        /**
+         * Authorization code acquired in the first step of OAuth2.0 authorization code flow. For more
+         * details, see https://aka.ms/msal4j-authorization-code-flow
+         * <p>
+         * Cannot be null.
+         */
+        public AuthorizationCodeParametersBuilder authorizationCode(String authorizationCode) {
+            validateNotNull("authorizationCode", authorizationCode);
+
+            this.authorizationCode = authorizationCode;
+            return this;
+        }
+
+        /**
+         * Redirect URI registered in the Azure portal, and which was used in the first step of OAuth2.0
+         * authorization code flow. For more details, see https://aka.ms/msal4j-authorization-code-flow
+         * <p>
+         * Cannot be null.
+         */
+        public AuthorizationCodeParametersBuilder redirectUri(URI redirectUri) {
+            validateNotNull("redirectUri", redirectUri);
+
+            this.redirectUri = redirectUri;
+            return this;
+        }
+
+        /**
+         * Scopes to which the application is requesting access
+         */
+        public AuthorizationCodeParametersBuilder scopes(Set<String> scopes) {
+            this.scopes = scopes;
+            return this;
+        }
+
+        /**
+         * Claims to be requested through the OIDC claims request parameter, allowing requests for standard and custom claims
+         */
+        public AuthorizationCodeParametersBuilder claims(ClaimsRequest claims) {
+            this.claims = claims;
+            return this;
+        }
+
+        /**
+         * Code verifier used for PKCE. For more details, see https://tools.ietf.org/html/rfc7636
+         */
+        public AuthorizationCodeParametersBuilder codeVerifier(String codeVerifier) {
+            this.codeVerifier = codeVerifier;
+            return this;
+        }
+
+        /**
+         * Adds additional headers to the token request
+         */
+        public AuthorizationCodeParametersBuilder extraHttpHeaders(Map<String, String> extraHttpHeaders) {
+            this.extraHttpHeaders = extraHttpHeaders;
+            return this;
+        }
+
+        /**
+         * Adds additional query parameters to the token request
+         */
+        public AuthorizationCodeParametersBuilder extraQueryParameters(Map<String, String> extraQueryParameters) {
+            this.extraQueryParameters = extraQueryParameters;
+            return this;
+        }
+
+        /**
+         * Overrides the tenant value in the authority URL for this request
+         */
+        public AuthorizationCodeParametersBuilder tenant(String tenant) {
+            this.tenant = tenant;
+            return this;
+        }
+
+        public AuthorizationCodeParameters build() {
+            return new AuthorizationCodeParameters(this.authorizationCode, this.redirectUri, this.scopes, this.claims, this.codeVerifier, this.extraHttpHeaders, this.extraQueryParameters, this.tenant);
+        }
+
+        public String toString() {
+            return "AuthorizationCodeParameters.AuthorizationCodeParametersBuilder(authorizationCode=" + this.authorizationCode + ", redirectUri=" + this.redirectUri + ", scopes=" + this.scopes + ", claims=" + this.claims + ", codeVerifier=" + this.codeVerifier + ", extraHttpHeaders=" + this.extraHttpHeaders + ", extraQueryParameters=" + this.extraQueryParameters + ", tenant=" + this.tenant + ")";
+        }
+    }
 }