Skip to content

Commit

Permalink
Merge pull request #538 from lastverb/master
Browse files Browse the repository at this point in the history
Version 3.35.0
  • Loading branch information
szprutamich authored Oct 11, 2024
2 parents 5d40244 + b936045 commit 09f15ee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.testdroid</groupId>
<artifactId>testdroid-api</artifactId>
<version>3.34.0</version>
<version>3.35.0</version>
<packaging>jar</packaging>
<name>Bitbar API v2</name>
<url>https://github.com/bitbar/testdroid-api</url>
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/testdroid/api/model/APIUser.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,9 @@ public String getDisplayName() {
public APIUser() {
}

public APIUser(
Long id, String email, String firstName, String lastName, LocalDateTime createTime, LocalDateTime deleteTime, Status status) {
public APIUser(Long id, String email) {
super(id);
this.email = email;
this.firstName = firstName;
this.lastName = lastName;
this.createTime = TimeConverter.toDate(createTime);
this.deleteTime = TimeConverter.toDate(deleteTime);
this.status = status;
this.enabled = status == Status.ENABLED;
}

@SuppressWarnings("squid:S107")
Expand All @@ -142,7 +135,13 @@ public APIUser(
String organization, String timeZone, LocalDateTime createTime, LocalDateTime deleteTime,
LocalDateTime lastLoginTime, LocalDateTime lastLaunchedTestTime, Boolean isAccountOwner, String apiKey,
Status status, Long createdById, String createdByEmail, MfaStatus mfaStatus, String registrationIP) {
this(id, email, firstName, lastName, createTime, deleteTime, status);
this(id, email);
this.firstName = firstName;
this.lastName = lastName;
this.createTime = TimeConverter.toDate(createTime);
this.deleteTime = TimeConverter.toDate(deleteTime);
this.status = status;
this.enabled = status == Status.ENABLED;
this.state = state;
this.country = country;
this.city = city;
Expand Down

0 comments on commit 09f15ee

Please sign in to comment.