feat: move towards java 17 partial commit (part 2)

src/main/java/de/caritas/cob/liveservice/config/security/WebSecurityConfig.java

@@ -5,8 +5,10 @@
 import de.caritas.cob.liveservice.api.config.SpringFoxConfig;
 import org.keycloak.adapters.KeycloakConfigResolver;
 import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
+import org.keycloak.adapters.springboot.KeycloakSpringBootProperties;
 import org.keycloak.adapters.springsecurity.KeycloakConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -42,7 +44,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
         .requestMatchers(new NegatedRequestMatcher(new AntPathRequestMatcher("/live/**")))
         .permitAll();
 
-    //httpSecurity.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtAuthConverter());
+    httpSecurity.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtAuthConverter());
     return httpSecurity.build();
   }
 
@@ -66,4 +68,10 @@ public KeycloakConfigResolver keycloakConfigResolver() {
     return new KeycloakSpringBootConfigResolver();
   }
 
+  @Bean
+  @ConfigurationProperties(prefix = "keycloak", ignoreUnknownFields = false)
+  public KeycloakSpringBootProperties keycloakSpringBootProperties() {
+    return new KeycloakSpringBootProperties();
+  }
+
 }

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 spring.main.allow-bean-definition-overriding=true
 keycloak.auth-server-url=
 keycloak.realm=
-keycloak.resource=
+keycloak.resource=resource1221
 keycloak.disable-trust-manager=true
 
 app.base.url=

src/test/java/de/caritas/cob/liveservice/LiveServiceApplicationIT.java

@@ -20,7 +20,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.caritas.cob.liveservice.api.controller.CustomSwaggerApiResourceController;
 import de.caritas.cob.liveservice.api.model.LiveEventMessage;
 import de.caritas.cob.liveservice.api.model.VideoCallRequestDTO;
 import de.caritas.cob.liveservice.websocket.model.WebSocketUserSession;
@@ -43,9 +42,6 @@
 @TestPropertySource(properties = "spring.profiles.active=testing")
 class LiveServiceApplicationIT extends StompClientIntegrationTest {
 
-  @MockBean
-  private CustomSwaggerApiResourceController customSwaggerApiResourceController;
-
   @Autowired
   private SocketUserRegistry socketUserRegistry;
 

src/test/java/de/caritas/cob/liveservice/StompClientIntegrationTest.java

@@ -20,8 +20,8 @@
 import lombok.SneakyThrows;
 import org.junit.runner.RunWith;
 import org.keycloak.common.VerificationException;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -57,8 +57,8 @@ public abstract class StompClientIntegrationTest extends AbstractJUnit4SpringCon
   private final StompSessionHandlerAdapter sessionHandler = new StompSessionHandlerAdapter() {
   };
 
-  @Value("${server.port}")
-  private Integer port;
+  @LocalServerPort
+  private int port;
 
   private final WebSocketStompClient socketStompClient = new WebSocketStompClient(
       new SockJsClient(singletonList(new WebSocketTransport(new StandardWebSocketClient()))));