From a133a74f5e6f880bc54e77e0067af2206c59169d Mon Sep 17 00:00:00 2001 From: hongwei Date: Fri, 17 Mar 2023 17:29:08 +0300 Subject: [PATCH] refactor/renamed MetricsJSON--> MetricsJsonV220 --- .../api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala | 2 +- .../src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala index 8f424a8ef..c4c3a87dd 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala @@ -3267,7 +3267,7 @@ object SwaggerDefinitionsJSON { log_level = "Debug", remote_data_secret_matched = Some(true) ) - val metricsJSON = MetricsJSON( + val metricsJSON = MetricsJsonV220( property = "String", value = "Mapper" ) diff --git a/obp-api/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala b/obp-api/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala index ca73db103..15eb4e55c 100644 --- a/obp-api/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala +++ b/obp-api/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala @@ -273,9 +273,9 @@ case class CreateAccountJSONV220( case class CachedFunctionJSON(function_name: String, ttl_in_seconds: Int) case class PortJSON(property: String, value: String) case class AkkaJSON(ports: List[PortJSON], log_level: String, remote_data_secret_matched: Option[Boolean]) -case class MetricsJSON(property: String, value: String) +case class MetricsJsonV220(property: String, value: String) case class WarehouseJSON(property: String, value: String) -case class ElasticSearchJSON(metrics: List[MetricsJSON], warehouse: List[WarehouseJSON]) +case class ElasticSearchJSON(metrics: List[MetricsJsonV220], warehouse: List[WarehouseJSON]) case class ScopesJSON(require_scopes_for_all_roles: Boolean, require_scopes_for_listed_roles: List[String]) case class ConfigurationJSON(akka: AkkaJSON, elastic_search: ElasticSearchJSON, cache: List[CachedFunctionJSON], scopes: ScopesJSON) @@ -797,8 +797,8 @@ object JSONFactory220 { val akka = AkkaJSON(akkaPorts, ObpActorConfig.akka_loglevel, APIUtil.akkaSanityCheck()) val cache = f1::f2::f3::f4::f5::f6::f7::f8::Nil - val metrics = MetricsJSON("es.metrics.port.tcp", APIUtil.getPropsValue("es.metrics.port.tcp", "9300")) :: - MetricsJSON("es.metrics.port.http", APIUtil.getPropsValue("es.metrics.port.tcp", "9200")) :: + val metrics = MetricsJsonV220("es.metrics.port.tcp", APIUtil.getPropsValue("es.metrics.port.tcp", "9300")) :: + MetricsJsonV220("es.metrics.port.http", APIUtil.getPropsValue("es.metrics.port.tcp", "9200")) :: Nil val warehouse = WarehouseJSON("es.warehouse.port.tcp", APIUtil.getPropsValue("es.warehouse.port.tcp", "9300")) :: WarehouseJSON("es.warehouse.port.http", APIUtil.getPropsValue("es.warehouse.port.http", "9200")) ::