mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-06-06 18:30:57 +00:00

# Description of Changes - **What was changed:** - Removed explicit constructor definitions annotated with `@Autowired` across services, controllers, filters, and schedulers. - Added Lombok’s `@RequiredArgsConstructor` to automatically generate required-args constructors and eliminate boilerplate. - Introduced other Lombok annotations (`@Data`, `@Getter`, `@Setter`, `@EqualsAndHashCode`, `@NoArgsConstructor`) on model and API classes to replace manual getters/setters and constructors. - Standardized string comparisons to use the constant-first form (e.g., `"value".equals(variable)`). - Cleaned up unused imports and organized OpenAPI configuration by extracting default title/description constants. - **Why the change was made:** - To reduce repetitive boilerplate code and improve maintainability. - To leverage Lombok for cleaner, more consistent dependency injection and data modeling. - To ensure a uniform coding style across the entire codebase. #3406 --- ## Checklist ### General - [x] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [x] I have performed a self-review of my own code - [x] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
99 lines
2.6 KiB
Java
99 lines
2.6 KiB
Java
package stirling.software.SPDF.model;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.stream.Collectors;
|
|
|
|
import jakarta.persistence.*;
|
|
|
|
import lombok.EqualsAndHashCode;
|
|
import lombok.Getter;
|
|
import lombok.NoArgsConstructor;
|
|
import lombok.Setter;
|
|
import lombok.ToString;
|
|
|
|
@Entity
|
|
@Table(name = "users")
|
|
@NoArgsConstructor
|
|
@Getter
|
|
@Setter
|
|
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
|
|
@ToString(onlyExplicitlyIncluded = true)
|
|
public class User implements Serializable {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Id
|
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
@Column(name = "user_id")
|
|
private Long id;
|
|
|
|
@Column(name = "username", unique = true)
|
|
private String username;
|
|
|
|
@Column(name = "password")
|
|
private String password;
|
|
|
|
@Column(name = "apiKey")
|
|
private String apiKey;
|
|
|
|
@Column(name = "enabled")
|
|
private boolean enabled;
|
|
|
|
@Column(name = "isFirstLogin")
|
|
private Boolean isFirstLogin = false;
|
|
|
|
@Column(name = "roleName")
|
|
private String roleName;
|
|
|
|
@Column(name = "authenticationtype")
|
|
private String authenticationType;
|
|
|
|
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
|
|
private Set<Authority> authorities = new HashSet<>();
|
|
|
|
@ElementCollection
|
|
@MapKeyColumn(name = "setting_key")
|
|
@Lob
|
|
@Column(name = "setting_value", columnDefinition = "text")
|
|
@CollectionTable(name = "user_settings", joinColumns = @JoinColumn(name = "user_id"))
|
|
private Map<String, String> settings = new HashMap<>(); // Key-value pairs of settings.
|
|
|
|
public String getRoleName() {
|
|
return Role.getRoleNameByRoleId(getRolesAsString());
|
|
}
|
|
|
|
public boolean isFirstLogin() {
|
|
return isFirstLogin != null && isFirstLogin;
|
|
}
|
|
|
|
public void setFirstLogin(boolean isFirstLogin) {
|
|
this.isFirstLogin = isFirstLogin;
|
|
}
|
|
|
|
public void setAuthenticationType(AuthenticationType authenticationType) {
|
|
this.authenticationType = authenticationType.toString().toLowerCase();
|
|
}
|
|
|
|
public void addAuthorities(Set<Authority> authorities) {
|
|
this.authorities.addAll(authorities);
|
|
}
|
|
|
|
public void addAuthority(Authority authority) {
|
|
this.authorities.add(authority);
|
|
}
|
|
|
|
public String getRolesAsString() {
|
|
return this.authorities.stream()
|
|
.map(Authority::getAuthority)
|
|
.collect(Collectors.joining(", "));
|
|
}
|
|
|
|
public boolean hasPassword() {
|
|
return this.password != null && !this.password.isEmpty();
|
|
}
|
|
}
|