Skip to content

Commit 264782e

Browse files
author
FusionAuth Automation
committed
Sync from monorepo 2918472a70a9
1 parent b5a0659 commit 264782e

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/main/java/io/fusionauth/domain/User.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public class User extends SecureIdentity implements Buildable<User>, Tenantable
7575

7676
public String lastName;
7777

78+
public String legacyIdentifier;
79+
7880
public ZonedDateTime lastUpdateInstant;
7981

8082
public String middleName;
@@ -114,6 +116,7 @@ public User(User other) {
114116
this.lastLoginInstant = other.lastLoginInstant;
115117
this.lastUpdateInstant = other.lastUpdateInstant;
116118
this.lastName = other.lastName;
119+
this.legacyIdentifier = other.legacyIdentifier;
117120
this.identities.addAll(other.identities.stream().map(UserIdentity::new).collect(Collectors.toCollection(ArrayList::new)));
118121
this.memberships.addAll(other.memberships.stream().map(GroupMember::new).collect(Collectors.toCollection(ArrayList::new)));
119122
this.middleName = other.middleName;
@@ -179,6 +182,7 @@ public boolean equals(Object o) {
179182
Objects.equals(imageUrl, user.imageUrl) &&
180183
Objects.equals(insertInstant, user.insertInstant) &&
181184
Objects.equals(lastName, user.lastName) &&
185+
Objects.equals(legacyIdentifier, user.legacyIdentifier) &&
182186
Objects.equals(lastUpdateInstant, user.lastUpdateInstant) &&
183187
Objects.equals(middleName, user.middleName) &&
184188
Objects.equals(mobilePhone, user.mobilePhone) &&
@@ -282,7 +286,7 @@ public boolean hasUserData() {
282286
@Override
283287
public int hashCode() {
284288
return Objects.hash(super.hashCode(), preferredLanguages, memberships, registrations, active, birthDate, cleanSpeakId, data,
285-
email, expiry, firstName, fullName, imageUrl, insertInstant, lastName, lastUpdateInstant, middleName, mobilePhone, parentEmail, phoneNumber, tenantId, timezone, twoFactor);
289+
email, expiry, firstName, fullName, imageUrl, insertInstant, lastName, legacyIdentifier, lastUpdateInstant, middleName, mobilePhone, parentEmail, phoneNumber, tenantId, timezone, twoFactor);
286290
}
287291

288292
/**
@@ -326,6 +330,7 @@ public void normalize() {
326330
firstName = trim(firstName);
327331
fullName = trim(fullName);
328332
lastName = trim(lastName);
333+
legacyIdentifier = trimToNull(legacyIdentifier);
329334
middleName = trim(middleName);
330335
mobilePhone = trim(mobilePhone);
331336
parentEmail = toLowerCase(trim(parentEmail));

src/main/java/io/fusionauth/domain/reactor/ReactorStatus.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public class ReactorStatus {
5353

5454
public ReactorFeatureStatus entityManagement = ReactorFeatureStatus.UNKNOWN;
5555

56+
public ReactorFeatureStatus legacyAdapter = ReactorFeatureStatus.UNKNOWN;
57+
5658
public LocalDate expiration;
5759

5860
public ReactorFeatureStatus ipGeoLocation = ReactorFeatureStatus.UNKNOWN;
@@ -98,6 +100,7 @@ public ReactorStatus(ReactorStatus other) {
98100
entityManagement = other.entityManagement;
99101
expiration = other.expiration;
100102
ipGeoLocation = other.ipGeoLocation;
103+
legacyAdapter = other.legacyAdapter;
101104
licenseAttributes.putAll(other.licenseAttributes);
102105
licensed = other.licensed;
103106
tenantManagerApplication = other.tenantManagerApplication;
@@ -133,6 +136,7 @@ public boolean equals(Object o) {
133136
dPoP == that.dPoP &&
134137
entityManagement == that.entityManagement &&
135138
ipGeoLocation == that.ipGeoLocation &&
139+
legacyAdapter == that.legacyAdapter &&
136140
Objects.equals(expiration, that.expiration) &&
137141
licensed == that.licensed &&
138142
Objects.equals(licenseAttributes, that.licenseAttributes) &&
@@ -163,6 +167,7 @@ public int hashCode() {
163167
entityManagement,
164168
expiration,
165169
ipGeoLocation,
170+
legacyAdapter,
166171
licensed,
167172
licenseAttributes,
168173
tenantManagerApplication,

0 commit comments

Comments
 (0)