test: spring tests update

vaadin · Aug 18, 2022 · 4419c0e · 4419c0e
1 parent 8257273
commit 4419c0e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/...tests/test-spring-common/src/main/java/com/vaadin/flow/spring/test/DummyOAuth2Server.java b/...tests/test-spring-common/src/main/java/com/vaadin/flow/spring/test/DummyOAuth2Server.java
@@ -11,18 +11,17 @@
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.source.JWKSource;
 import com.nimbusds.jose.proc.SecurityContext;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
 import org.springframework.security.oauth2.core.oidc.OidcScopes;
 import org.springframework.security.oauth2.server.authorization.client.InMemoryRegisteredClientRepository;
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 @Import(OAuth2AuthorizationServerConfiguration.class)
 @Configuration

diff --git a/...-spring-security-flow/src/main/java/com/vaadin/flow/spring/flowsecurity/data/Account.java b/...-spring-security-flow/src/main/java/com/vaadin/flow/spring/flowsecurity/data/Account.java
@@ -8,13 +8,10 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
-import org.hibernate.annotations.Type;
-
 @Entity
 public class Account {
     @Id
     @GeneratedValue
-    @Type(type = "uuid-char")
     private UUID id;
 
     @ManyToOne

diff --git a/...spring-security-flow/src/main/java/com/vaadin/flow/spring/flowsecurity/data/UserInfo.java b/...spring-security-flow/src/main/java/com/vaadin/flow/spring/flowsecurity/data/UserInfo.java
@@ -11,14 +11,11 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import org.hibernate.annotations.Type;
-
 @Entity
 public class UserInfo {
 
     @Id
     @GeneratedValue
-    @Type(type = "uuid-char")
     private UUID id;
 
     private String username;