diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c628898..c60c9e5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -3,7 +3,7 @@ name: Gradle Build Check on: pull_request: paths: - - "gateway/**" + - "monolith/**" jobs: build: runs-on: ubuntu-latest @@ -20,5 +20,5 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - - name: Execute Gradle Build of Gateway - run: (cd gateway && ./gradlew build) + - name: Execute Gradle Build of the Monolith + run: (cd monolith && ./gradlew build) diff --git a/gateway/settings.gradle.kts b/gateway/settings.gradle.kts deleted file mode 100644 index fd3974e..0000000 --- a/gateway/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "gateway" diff --git a/gateway/.gitignore b/monolith/.gitignore similarity index 100% rename from gateway/.gitignore rename to monolith/.gitignore diff --git a/gateway/build.gradle.kts b/monolith/build.gradle.kts similarity index 98% rename from gateway/build.gradle.kts rename to monolith/build.gradle.kts index 881692e..c7ed858 100644 --- a/gateway/build.gradle.kts +++ b/monolith/build.gradle.kts @@ -60,7 +60,7 @@ val generateControllers = "generateControllers" tasks.register(generateControllers) { val spec = "${layout.projectDirectory}/src/main/resources/static/openapi/api.yml" - val pkg = "ru.itmo.lms.gateway.api.http" + val pkg = "ru.itmo.lms.monolith.api.http" group = "openapi tools" description = "Generates code from an Open API specification" diff --git a/gateway/gradle/wrapper/gradle-wrapper.jar b/monolith/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gateway/gradle/wrapper/gradle-wrapper.jar rename to monolith/gradle/wrapper/gradle-wrapper.jar diff --git a/gateway/gradle/wrapper/gradle-wrapper.properties b/monolith/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gateway/gradle/wrapper/gradle-wrapper.properties rename to monolith/gradle/wrapper/gradle-wrapper.properties diff --git a/gateway/gradlew b/monolith/gradlew similarity index 100% rename from gateway/gradlew rename to monolith/gradlew diff --git a/gateway/gradlew.bat b/monolith/gradlew.bat similarity index 100% rename from gateway/gradlew.bat rename to monolith/gradlew.bat diff --git a/monolith/settings.gradle.kts b/monolith/settings.gradle.kts new file mode 100644 index 0000000..80340d8 --- /dev/null +++ b/monolith/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "monolith" diff --git a/gateway/src/main/kotlin/ru/itmo/lms/gateway/GatewayApplication.kt b/monolith/src/main/kotlin/ru/itmo/lms/monolith/LMSApplication.kt similarity index 62% rename from gateway/src/main/kotlin/ru/itmo/lms/gateway/GatewayApplication.kt rename to monolith/src/main/kotlin/ru/itmo/lms/monolith/LMSApplication.kt index 226e329..c51fa9b 100644 --- a/gateway/src/main/kotlin/ru/itmo/lms/gateway/GatewayApplication.kt +++ b/monolith/src/main/kotlin/ru/itmo/lms/monolith/LMSApplication.kt @@ -1,11 +1,11 @@ -package ru.itmo.lms.gateway +package ru.itmo.lms.monolith import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication @SpringBootApplication -class GatewayApplication +class LMSApplication fun main(args: Array) { - runApplication(args = args) + runApplication(args = args) } diff --git a/gateway/src/main/kotlin/ru/itmo/lms/gateway/api/http/MonitoringHttpApi.kt b/monolith/src/main/kotlin/ru/itmo/lms/monolith/api/http/MonitoringHttpApi.kt similarity index 74% rename from gateway/src/main/kotlin/ru/itmo/lms/gateway/api/http/MonitoringHttpApi.kt rename to monolith/src/main/kotlin/ru/itmo/lms/monolith/api/http/MonitoringHttpApi.kt index 2187504..0db8b8b 100644 --- a/gateway/src/main/kotlin/ru/itmo/lms/gateway/api/http/MonitoringHttpApi.kt +++ b/monolith/src/main/kotlin/ru/itmo/lms/monolith/api/http/MonitoringHttpApi.kt @@ -1,8 +1,8 @@ -package ru.itmo.lms.gateway.api.http +package ru.itmo.lms.monolith.api.http import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RestController -import ru.itmo.lms.gateway.api.http.apis.MonitoringApi +import ru.itmo.lms.monolith.api.http.apis.MonitoringApi @RestController class MonitoringHttpApi : MonitoringApi { diff --git a/gateway/src/main/resources/application.yml b/monolith/src/main/resources/application.yml similarity index 88% rename from gateway/src/main/resources/application.yml rename to monolith/src/main/resources/application.yml index a09682f..86dfa44 100644 --- a/gateway/src/main/resources/application.yml +++ b/monolith/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: gateway + name: monolith server: port: 8080 springdoc: diff --git a/gateway/src/main/resources/static/openapi/api.yml b/monolith/src/main/resources/static/openapi/api.yml similarity index 95% rename from gateway/src/main/resources/static/openapi/api.yml rename to monolith/src/main/resources/static/openapi/api.yml index ee5f505..a0ed4c6 100644 --- a/gateway/src/main/resources/static/openapi/api.yml +++ b/monolith/src/main/resources/static/openapi/api.yml @@ -1,6 +1,6 @@ openapi: 3.0.3 info: - title: LMS Gateway + title: LMS Monolith version: 0.0.1 servers: - url: /api/v1 diff --git a/gateway/src/test/kotlin/ru/itmo/lms/gateway/GatewayApplicationTests.kt b/monolith/src/test/kotlin/ru/itmo/lms/monolith/LMSApplicationTests.kt similarity index 74% rename from gateway/src/test/kotlin/ru/itmo/lms/gateway/GatewayApplicationTests.kt rename to monolith/src/test/kotlin/ru/itmo/lms/monolith/LMSApplicationTests.kt index 5431a9e..dfbb663 100644 --- a/gateway/src/test/kotlin/ru/itmo/lms/gateway/GatewayApplicationTests.kt +++ b/monolith/src/test/kotlin/ru/itmo/lms/monolith/LMSApplicationTests.kt @@ -1,10 +1,10 @@ -package ru.itmo.lms.gateway +package ru.itmo.lms.monolith import org.junit.jupiter.api.Test import org.springframework.boot.test.context.SpringBootTest @SpringBootTest -class GatewayApplicationTests { +class LMSApplicationTests { @Test fun contextLoads() { // Do nothing