From c52ca1604fc7d6d24cf5a983f82cd7f677d4e8e8 Mon Sep 17 00:00:00 2001
From: Gretchen-z <rysrit@gmail.com>
Date: Fri, 28 Jun 2024 10:08:32 +0300
Subject: [PATCH 1/2] Remove oath2 usage and dependencies

---
 pom.xml                                                   | 8 --------
 .../java/dev/vality/wachter/config/SecurityConfig.java    | 8 +-------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3006300..aedfdf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,14 +65,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-oauth2-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-spring-boot-starter</artifactId>
diff --git a/src/main/java/dev/vality/wachter/config/SecurityConfig.java b/src/main/java/dev/vality/wachter/config/SecurityConfig.java
index 8556026..d3e4a91 100644
--- a/src/main/java/dev/vality/wachter/config/SecurityConfig.java
+++ b/src/main/java/dev/vality/wachter/config/SecurityConfig.java
@@ -17,9 +17,6 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import static org.springframework.security.config.Customizer.withDefaults;
-
-
 @Configuration
 @ComponentScan(
         basePackageClasses = KeycloakSecurityComponents.class,
@@ -43,10 +40,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .requestMatchers(HttpMethod.GET, "/**/health/liveness").permitAll()
                         .requestMatchers(HttpMethod.GET, "/**/health/readiness").permitAll()
                         .requestMatchers(HttpMethod.GET, "/**/actuator/prometheus").permitAll()
-                        .anyRequest().authenticated())
-                .oauth2Login(withDefaults())
-                .oauth2Client(withDefaults())
-                .oauth2ResourceServer(withDefaults());
+                        .anyRequest().authenticated());
 
         return http.build();
     }

From a1b682107d715f7ad600f9968ccc859e16815fbd Mon Sep 17 00:00:00 2001
From: Gretchen-z <rysrit@gmail.com>
Date: Mon, 1 Jul 2024 12:51:19 +0300
Subject: [PATCH 2/2] Change jakarta.xml.bind-api version

---
 pom.xml                                                       | 1 +
 src/main/resources/application.yml                            | 4 ++--
 .../dev/vality/wachter/controller/ErrorControllerTest.java    | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index aedfdf5..d3666ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 32e0cab..e3ce2f7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,10 +1,10 @@
 server:
-  port: '@server.port@'
+  port: '${server.port}'
 management:
   security:
     flag: false
   server:
-    port: '@management.port@'
+    port: '${management.port}'
   metrics:
     tags:
       application: '@project.name@'
diff --git a/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java b/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java
index 9b25f5d..bfce61b 100644
--- a/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java
+++ b/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java
@@ -5,7 +5,6 @@
 import dev.vality.wachter.exeptions.WachterException;
 import dev.vality.wachter.testutil.TMessageUtil;
 import lombok.SneakyThrows;
-import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.junit.jupiter.api.AfterEach;