From 6b832ab4caf7c073a311e40105a75c8454e5c5eb Mon Sep 17 00:00:00 2001 From: David Date: Fri, 12 Sep 2025 12:26:58 +0200 Subject: [PATCH] fix all error for package for login --- .../com/dh7789dev/xpeditis/dto/request/RegisterRequest.java | 1 + .../xpeditis/dto/response/AuthenticationResponse.java | 1 + .../com/dh7789dev/xpeditis/dto/response/TokenResponse.java | 1 + .../java/com/dh7789dev/xpeditis/entity/CompanyEntity.java | 4 +--- .../java/com/dh7789dev/xpeditis/entity/LicenseEntity.java | 4 +--- .../main/java/com/dh7789dev/xpeditis/entity/UserEntity.java | 4 +--- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/RegisterRequest.java b/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/RegisterRequest.java index 8759eab..e8624df 100644 --- a/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/RegisterRequest.java +++ b/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/RegisterRequest.java @@ -54,6 +54,7 @@ public class RegisterRequest { String companyCountry; + @Builder.Default AuthProvider authProvider = AuthProvider.LOCAL; String googleId; diff --git a/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/AuthenticationResponse.java b/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/AuthenticationResponse.java index 26ffd81..40f9dcf 100644 --- a/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/AuthenticationResponse.java +++ b/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/AuthenticationResponse.java @@ -28,6 +28,7 @@ public class AuthenticationResponse { String refreshToken; @JsonProperty("token_type") + @Builder.Default String tokenType = "Bearer"; @JsonProperty("expires_in") diff --git a/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/TokenResponse.java b/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/TokenResponse.java index 874e917..c49e89d 100644 --- a/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/TokenResponse.java +++ b/domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/TokenResponse.java @@ -17,6 +17,7 @@ public class TokenResponse { String token; String refreshToken; long expiresIn; + @Builder.Default String tokenType = "Bearer"; UserResponse user; } \ No newline at end of file diff --git a/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/CompanyEntity.java b/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/CompanyEntity.java index 5a1ca1b..2a6705a 100644 --- a/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/CompanyEntity.java +++ b/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/CompanyEntity.java @@ -7,7 +7,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.FieldDefaults; import lombok.experimental.FieldNameConstants; -import org.hibernate.annotations.GenericGenerator; import java.time.LocalDateTime; import java.util.List; @@ -24,8 +23,7 @@ import java.util.UUID; public class CompanyEntity { @Id - @GeneratedValue(generator = "UUID") - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") + @GeneratedValue(strategy = GenerationType.UUID) @Column(columnDefinition = "BINARY(16)") UUID id; diff --git a/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/LicenseEntity.java b/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/LicenseEntity.java index f564f6c..19ca30a 100644 --- a/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/LicenseEntity.java +++ b/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/LicenseEntity.java @@ -7,7 +7,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.FieldDefaults; import lombok.experimental.FieldNameConstants; -import org.hibernate.annotations.GenericGenerator; import java.time.LocalDate; import java.time.LocalDateTime; @@ -24,8 +23,7 @@ import java.util.UUID; public class LicenseEntity { @Id - @GeneratedValue(generator = "UUID") - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") + @GeneratedValue(strategy = GenerationType.UUID) @Column(columnDefinition = "BINARY(16)") UUID id; diff --git a/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/UserEntity.java b/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/UserEntity.java index 3690e2d..c7ef384 100644 --- a/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/UserEntity.java +++ b/infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/UserEntity.java @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.FieldDefaults; import lombok.experimental.FieldNameConstants; -import org.hibernate.annotations.GenericGenerator; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -29,8 +28,7 @@ import java.util.UUID; public class UserEntity implements UserDetails { @Id - @GeneratedValue(generator = "UUID") - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") + @GeneratedValue(strategy = GenerationType.UUID) @Column(columnDefinition = "BINARY(16)") UUID id;