From 95371d694d16515788875eb99f0e2b5ee408b341 Mon Sep 17 00:00:00 2001 From: Daniel Chang Date: Fri, 3 May 2024 13:29:18 -0700 Subject: [PATCH] funman cleanup (#3500) Co-authored-by: David Gauldie --- .../hmiserver/proxies/funman/FunmanProxy.java | 23 ------------------- .../resources/application-beta.properties | 1 - .../src/main/resources/application.properties | 1 - 3 files changed, 25 deletions(-) delete mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/proxies/funman/FunmanProxy.java diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/proxies/funman/FunmanProxy.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/proxies/funman/FunmanProxy.java deleted file mode 100644 index 9e9aa899e1..0000000000 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/proxies/funman/FunmanProxy.java +++ /dev/null @@ -1,23 +0,0 @@ -package software.uncharted.terarium.hmiserver.proxies.funman; - -import com.fasterxml.jackson.databind.JsonNode; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import software.uncharted.terarium.hmiserver.models.funman.FunmanPostQueriesRequest; - -@FeignClient(name = "funman-api", url = "${funman-service.url}", path = "/api/queries") -public interface FunmanProxy { - - @GetMapping("/{queryId}/halt") - ResponseEntity halt(@PathVariable("queryId") String queryId); - - @GetMapping("/{queryId}") - ResponseEntity getQueries(@PathVariable("queryId") String queryId); - - @PostMapping - ResponseEntity postQueries(@RequestBody FunmanPostQueriesRequest requestBody); -} diff --git a/packages/server/src/main/resources/application-beta.properties b/packages/server/src/main/resources/application-beta.properties index cdaeee8c3b..539c8af2c9 100644 --- a/packages/server/src/main/resources/application-beta.properties +++ b/packages/server/src/main/resources/application-beta.properties @@ -58,7 +58,6 @@ skema-unified.url=https://api.askem.lum.ai terarium.dataservice.url=https://data-service.beta.terarium.ai xdd-dev-service.url=https://xdddev.chtc.io xdd-prod-service.url=https://xdd.wisc.edu -funman-service.url=https://funman.beta.terarium.ai simulation-service.url=https://sciml-service.beta.terarium.ai ciemss-service.url=https://pyciemss.beta.terarium.ai diff --git a/packages/server/src/main/resources/application.properties b/packages/server/src/main/resources/application.properties index 8cd26718c2..6d76646aab 100644 --- a/packages/server/src/main/resources/application.properties +++ b/packages/server/src/main/resources/application.properties @@ -150,7 +150,6 @@ terarium.dataservice.url=https://data-service.staging.terarium.ai xdd-dev-service.url=https://xdddev.chtc.io xdd-prod-service.url=https://xdd.wisc.edu cosmos-service.url=https://cosmos.staging.terarium.ai -funman-service.url=https://funman.staging.terarium.ai simulation-service.url=https://sciml-service.staging.terarium.ai ciemss-service.url=https://pyciemss.staging.terarium.ai climate-data-service.url=https://climate-data.staging.terarium.ai