This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch cybershuttle-staging in repository https://gitbox.apache.org/repos/asf/airavata.git
commit a3949229cefdd4d2849c9747f31c02c7ca0008e3 Author: ganning127 <[email protected]> AuthorDate: Sun Mar 30 14:54:21 2025 -0400 Setup complete --- .gitignore | 2 ++ modules/research-framework/research-service/pom.xml | 7 ++++++- .../research/service/controller/ProjectController.java | 2 ++ .../research-service/src/main/resources/application.yml | 13 +++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db30446109..6e7f390882 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,6 @@ airavata-local-agent/proxy/websockify airavata-local-agent/renderer/.next airavata-local-agent/dist +modules/research-framework/compose + logs diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml index e0c8792743..1a5869c26c 100644 --- a/modules/research-framework/research-service/pom.xml +++ b/modules/research-framework/research-service/pom.xml @@ -80,6 +80,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.springdoc</groupId> + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> + <version>2.5.0</version> + </dependency> <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-stub</artifactId> @@ -190,4 +195,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ProjectController.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ProjectController.java index 80f392eedd..932d167b5e 100644 --- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ProjectController.java +++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ProjectController.java @@ -22,9 +22,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.tags.Tag; @RestController @RequestMapping("/api/v1/rf/project") +@Tag(name = "Project", description = "The Project API") public class ProjectController { private static final Logger LOGGER = LoggerFactory.getLogger(ProjectController.class); diff --git a/modules/research-framework/research-service/src/main/resources/application.yml b/modules/research-framework/research-service/src/main/resources/application.yml index db0649d2ba..73bbfdf573 100644 --- a/modules/research-framework/research-service/src/main/resources/application.yml +++ b/modules/research-framework/research-service/src/main/resources/application.yml @@ -16,8 +16,8 @@ spring: max-file-size: 200MB max-request-size: 200MB datasource: - url: "jdbc:mariadb://airavata.host:13306/research_catalog" - username: "root" + url: "jdbc:mariadb://localhost:13306/research_catalog" + username: "airavata" password: "123456" driver-class-name: org.mariadb.jdbc.Driver hikari: @@ -27,3 +27,12 @@ spring: hibernate: ddl-auto: create open-in-view: false + +springdoc: + api-docs: + enabled: true + swagger-ui: + path: /swagger-ui.html + operationsSorter: alpha + tagsSorter: alpha + doc-expansion: none
