Merge remote-tracking branch 'origin/avdunn/nimbus-json' into avdunn/nimbus-json

Author: Avery-Dunn

msal4j-sdk/pom.xml

@@ -59,7 +59,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.36</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>

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

@@ -3,34 +3,63 @@
 
 package com.microsoft.aad.msal4j;
 
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Representation of a single user account. If modifying this object, ensure it is compliant with
  * cache persistent model
  */
-@Accessors(fluent = true)
-@Getter
-@Setter
-@EqualsAndHashCode(of = {"homeAccountId"})
-@AllArgsConstructor
 class Account implements IAccount {
 
     String homeAccountId;
-
     String environment;
-
     String username;
-
     Map<String, ITenantProfile> tenantProfiles;
 
+    Account(String homeAccountId, String environment, String username, Map<String, ITenantProfile> tenantProfiles) {
+        this.homeAccountId = homeAccountId;
+        this.environment = environment;
+        this.username = username;
+        this.tenantProfiles = tenantProfiles;
+    }
+
     public Map<String, ITenantProfile> getTenantProfiles() {
         return tenantProfiles;
     }
+
+    public String homeAccountId() {
+        return this.homeAccountId;
+    }
+
+    public String environment() {
+        return this.environment;
+    }
+
+    public String username() {
+        return this.username;
+    }
+
+    void username(String username) {
+        this.username = username;
+    }
+
+    //These methods are based on those generated by Lombok's @EqualsAndHashCode annotation.
+    //They have the same functionality as the generated methods, but were refactored for readability.
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Account)) return false;
+
+        Account other = (Account) o;
+
+        return Objects.equals(homeAccountId(), other.homeAccountId());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = result * 59 + (this.homeAccountId == null ? 43 : this.homeAccountId.hashCode());
+        return result;
+    }
 }

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

@@ -4,18 +4,12 @@
 package com.microsoft.aad.msal4j;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 
-@Accessors(fluent = true)
-@Getter
-@Setter
-@EqualsAndHashCode
 class AccountCacheEntity implements Serializable {
 
     static final String MSSTS_ACCOUNT_TYPE = "MSSTS";
@@ -106,4 +100,111 @@ static AccountCacheEntity create(String clientInfoStr, Authority requestAuthorit
     IAccount toAccount() {
         return new Account(homeAccountId, environment, username, null);
     }
+
+    String homeAccountId() {
+        return this.homeAccountId;
+    }
+
+    String environment() {
+        return this.environment;
+    }
+
+    String realm() {
+        return this.realm;
+    }
+
+    String localAccountId() {
+        return this.localAccountId;
+    }
+
+    String username() {
+        return this.username;
+    }
+
+    String name() {
+        return this.name;
+    }
+
+    String clientInfoStr() {
+        return this.clientInfoStr;
+    }
+
+    String userAssertionHash() {
+        return this.userAssertionHash;
+    }
+
+    String authorityType() {
+        return this.authorityType;
+    }
+
+    void homeAccountId(String homeAccountId) {
+        this.homeAccountId = homeAccountId;
+    }
+
+    void environment(String environment) {
+        this.environment = environment;
+    }
+
+    void realm(String realm) {
+        this.realm = realm;
+    }
+
+    void localAccountId(String localAccountId) {
+        this.localAccountId = localAccountId;
+    }
+
+    void username(String username) {
+        this.username = username;
+    }
+
+    void name(String name) {
+        this.name = name;
+    }
+
+    void clientInfoStr(String clientInfoStr) {
+        this.clientInfoStr = clientInfoStr;
+    }
+
+    void userAssertionHash(String userAssertionHash) {
+        this.userAssertionHash = userAssertionHash;
+    }
+
+    void authorityType(String authorityType) {
+        this.authorityType = authorityType;
+    }
+
+    //These methods are based on those generated by Lombok's @EqualsAndHashCode annotation.
+    //They have the same functionality as the generated methods, but were refactored for readability.
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof AccountCacheEntity)) return false;
+
+        AccountCacheEntity other = (AccountCacheEntity) o;
+
+        if (!Objects.equals(homeAccountId(), other.homeAccountId())) return false;
+        if (!Objects.equals(environment(), other.environment())) return false;
+        if (!Objects.equals(realm(), other.realm())) return false;
+        if (!Objects.equals(localAccountId(), other.localAccountId())) return false;
+        if (!Objects.equals(username(), other.username())) return false;
+        if (!Objects.equals(name(), other.name())) return false;
+        if (!Objects.equals(clientInfoStr(), other.clientInfoStr())) return false;
+        if (!Objects.equals(userAssertionHash(), other.userAssertionHash())) return false;
+        return Objects.equals(authorityType(), other.authorityType());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = result * 59 + (this.homeAccountId == null ? 43 : this.homeAccountId.hashCode());
+        result = result * 59 + (this.environment == null ? 43 : this.environment.hashCode());
+        result = result * 59 + (this.realm == null ? 43 : this.realm.hashCode());
+        result = result * 59 + (this.localAccountId == null ? 43 : this.localAccountId.hashCode());
+        result = result * 59 + (this.username == null ? 43 : this.username.hashCode());
+        result = result * 59 + (this.name() == null ? 43 : this.name().hashCode());
+        result = result * 59 + (this.clientInfoStr == null ? 43 : this.clientInfoStr.hashCode());
+        result = result * 59 + (this.userAssertionHash == null ? 43 : this.userAssertionHash.hashCode());
+        result = result * 59 + (this.authorityType == null ? 43 : this.authorityType.hashCode());
+        return result;
+    }
 }