From b668d6ceccd3b157597ecbc8bc4a610c8d460c42 Mon Sep 17 00:00:00 2001
From: hirst <hirsting@gmail.com>
Date: Sat, 1 Jun 2024 16:34:37 +0200
Subject: [PATCH] openapi setup

---
 dummy/pom.xml                              | 19 +++++++++++++------
 dummy/src/main/resources/application.yml   |  1 +
 gateway/pom.xml                            |  2 +-
 gateway/src/main/resources/application.yml |  2 --
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dummy/pom.xml b/dummy/pom.xml
index 071da9e..ebe8990 100644
--- a/dummy/pom.xml
+++ b/dummy/pom.xml
@@ -35,19 +35,18 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.springframework.security.oauth/spring-security-oauth2 -->
+	<!--	 https://mvnrepository.com/artifact/org.springframework.security.oauth/spring-security-oauth2 -->
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>
 			<version>2.5.2.RELEASE</version>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-oauth2-resource-server</artifactId>
@@ -58,16 +57,24 @@
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
 	</dependencies>
 
 </project>
diff --git a/dummy/src/main/resources/application.yml b/dummy/src/main/resources/application.yml
index a50a127..0c21d6c 100644
--- a/dummy/src/main/resources/application.yml
+++ b/dummy/src/main/resources/application.yml
@@ -15,6 +15,7 @@ spring:
       password: admin
 
 springdoc:
+
   enable-native-support: true
   api-docs:
     enabled: true
diff --git a/gateway/pom.xml b/gateway/pom.xml
index 94ccd49..e201005 100644
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
-			<version>2.2.0</version>
+			<version>2.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index 9b2ea0b..c7acec3 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -27,7 +27,6 @@ spring:
           predicates:
             - Path=/eureka/**
         # dummy service routing
-        # TODO smth is wrong with this
         - id: dummy
           uri: lb://dummy
           predicates:
@@ -69,7 +68,6 @@ springdoc:
     urls:
       - name: Gateway API
         url: /v3/api-docs
-        # TODO not working rn
       - name: Dummy Service API
         url: /api/v1/dummy/v3/api-docs