Skip to content

Commit 5bb8caf

Browse files
committed
Change externalUserId to serviceUserId in LocalUser according to changes in the external service repository
1 parent 809caac commit 5bb8caf

File tree

1 file changed

+6
-6
lines changed
  • kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user

1 file changed

+6
-6
lines changed

kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class LocalUser implements User {
3535
private static final Pattern ILLEGAL_CHARACTERS_PATTERN = Pattern.compile("[^a-zA-Z0-9_-]");
3636
private String id;
3737
private String version;
38-
private String externalUserId;
38+
private String serviceUserId;
3939
private String projectId;
4040
private String userId;
4141
private String sourceId;
@@ -62,7 +62,7 @@ public void setId(String id) {
6262
}
6363

6464
public String getExternalUserId() {
65-
return externalUserId;
65+
return serviceUserId;
6666
}
6767

6868
public String getProjectId() {
@@ -95,7 +95,7 @@ public void setOauth2Credentials(OAuth2UserCredentials oauth2Credentials) {
9595

9696
@JsonSetter("fitbitUserId")
9797
public void setFitbitUserId(String id) {
98-
this.externalUserId = id;
98+
this.serviceUserId = id;
9999
}
100100

101101
@Override
@@ -120,7 +120,7 @@ public LocalUser copy() {
120120
LocalUser copy = new LocalUser();
121121
copy.id = id;
122122
copy.version = version;
123-
copy.externalUserId = externalUserId;
123+
copy.serviceUserId = serviceUserId;
124124
copy.projectId = projectId;
125125
copy.userId = userId;
126126
copy.startDate = startDate;
@@ -142,7 +142,7 @@ public synchronized SchemaAndValue getObservationKey(AvroData avroData) {
142142
public String toString() {
143143
return "LocalUser{id='" + id + '\''
144144
+ ", version='" + version + '\''
145-
+ ", externalUserId='" + externalUserId + '\''
145+
+ ", externalUserId='" + serviceUserId + '\''
146146
+ ", projectId='" + projectId + '\''
147147
+ ", userId='" + userId + '\''
148148
+ ", sourceId='" + sourceId + '\''
@@ -161,7 +161,7 @@ public boolean equals(Object o) {
161161
LocalUser localUser = (LocalUser) o;
162162
return Objects.equals(id, localUser.id)
163163
&& Objects.equals(version, localUser.version)
164-
&& Objects.equals(externalUserId, localUser.externalUserId)
164+
&& Objects.equals(serviceUserId, localUser.serviceUserId)
165165
&& Objects.equals(projectId, localUser.projectId)
166166
&& Objects.equals(userId, localUser.userId)
167167
&& Objects.equals(sourceId, localUser.sourceId)

0 commit comments

Comments
 (0)