Compare commits

..

No commits in common. "d1be066a20535870b7bd17b9e8c2472e39a15677" and "f86389cb84bcfdd9848411073550cfbdd3010227" have entirely different histories.

6 changed files with 9 additions and 6 deletions

View File

@ -54,7 +54,6 @@ public class RegisterRequest {
String companyCountry;
@Builder.Default
AuthProvider authProvider = AuthProvider.LOCAL;
String googleId;

View File

@ -28,7 +28,6 @@ public class AuthenticationResponse {
String refreshToken;
@JsonProperty("token_type")
@Builder.Default
String tokenType = "Bearer";
@JsonProperty("expires_in")

View File

@ -17,7 +17,6 @@ public class TokenResponse {
String token;
String refreshToken;
long expiresIn;
@Builder.Default
String tokenType = "Bearer";
UserResponse user;
}

View File

@ -7,6 +7,7 @@ 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;
@ -23,7 +24,8 @@ import java.util.UUID;
public class CompanyEntity {
@Id
@GeneratedValue(strategy = GenerationType.UUID)
@GeneratedValue(generator = "UUID")
@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
@Column(columnDefinition = "BINARY(16)")
UUID id;

View File

@ -7,6 +7,7 @@ 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;
@ -23,7 +24,8 @@ import java.util.UUID;
public class LicenseEntity {
@Id
@GeneratedValue(strategy = GenerationType.UUID)
@GeneratedValue(generator = "UUID")
@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
@Column(columnDefinition = "BINARY(16)")
UUID id;

View File

@ -8,6 +8,7 @@ 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;
@ -28,7 +29,8 @@ import java.util.UUID;
public class UserEntity implements UserDetails {
@Id
@GeneratedValue(strategy = GenerationType.UUID)
@GeneratedValue(generator = "UUID")
@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
@Column(columnDefinition = "BINARY(16)")
UUID id;