[ambari] 26/36: AMBARI-22359 : Fix Serialization issues in Metric Definition Service (avijayan).

2018-03-12 Thread avijayan 
This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-feature-AMBARI-23212
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit d865b6ef31c894d4160690edf93fdaf430296e86
Author: Aravindan Vijayan 
AuthorDate: Thu Nov 2 14:41:38 2017 -0700

AMBARI-22359 : Fix Serialization issues in Metric Definition Service 
(avijayan).
---
 .../src/main/resources/config.yml  |  4 +-
 .../adservice/app/AnomalyDetectionAppConfig.scala  | 10 ++---
 .../ambari/metrics/adservice/common/Season.scala   |  4 +-
 .../MetricCollectorConfiguration.scala | 10 -
 ... => MetricDefinitionServiceConfiguration.scala} |  2 +-
 .../adservice/db/PhoenixAnomalyStoreAccessor.scala |  8 ++--
 .../adservice/metadata/ADMetadataProvider.scala| 12 ++---
 .../adservice/metadata/MetricDefinition.scala  | 52 ++
 ...Service.scala => MetricDefinitionService.scala} |  2 +-
 ...mpl.scala => MetricDefinitionServiceImpl.scala} | 34 --
 .../metadata/MetricSourceDefinition.scala  | 38 +---
 .../app/AnomalyDetectionAppConfigTest.scala|  2 +-
 .../metrics/adservice/common/SeasonTest.scala  |  4 +-
 ...est.scala => MetricDefinitionServiceTest.scala} | 34 +++---
 .../metadata/MetricSourceDefinitionTest.scala  | 11 +++--
 15 files changed, 126 insertions(+), 101 deletions(-)

diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
index 6953745..920c50c 100644
--- 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
@@ -20,8 +20,8 @@ server:
 logging:
   type: external
 
-metricManagerService:
-  inputDefinitionDirectory: /etc/adservice/conf/input-definitions-directory
+metricDefinitionService:
+  inputDefinitionDirectory: /etc/ambari-metrics-anomaly-detection/conf
 
 metricsCollector:
   hostPortList: host1:6188,host2:6188
diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
index be8d027..c1ef0d1 100644
--- 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
@@ -20,7 +20,7 @@ package org.apache.ambari.metrics.adservice.app
 
 import javax.validation.Valid
 
-import 
org.apache.ambari.metrics.adservice.configuration.{AdServiceConfiguration, 
HBaseConfiguration, MetricCollectorConfiguration, 
MetricManagerServiceConfiguration}
+import 
org.apache.ambari.metrics.adservice.configuration.{AdServiceConfiguration, 
HBaseConfiguration, MetricCollectorConfiguration, 
MetricDefinitionServiceConfiguration}
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -35,7 +35,7 @@ class AnomalyDetectionAppConfig extends Configuration {
Metric Definition Service configuration
 */
   @Valid
-  private val metricManagerServiceConfiguration = new 
MetricManagerServiceConfiguration
+  private val metricDefinitionServiceConfiguration = new 
MetricDefinitionServiceConfiguration
 
   @Valid
   private val metricCollectorConfiguration = new MetricCollectorConfiguration
@@ -53,9 +53,9 @@ class AnomalyDetectionAppConfig extends Configuration {
 HBaseConfiguration.getHBaseConf
   }
 
-  @JsonProperty("metricManagerService")
-  def getMetricManagerServiceConfiguration: MetricManagerServiceConfiguration 
= {
-metricManagerServiceConfiguration
+  @JsonProperty("metricDefinitionService")
+  def getMetricDefinitionServiceConfiguration: 
MetricDefinitionServiceConfiguration = {
+metricDefinitionServiceConfiguration
   }
 
   @JsonProperty("adQueryService")
diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
index aba2587..f875e3b 100644
--- 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
@@ -112,11 +112,11 @@ object Season {
 validSeasons.toList
   }
 
-  def serialize(season: Season) : String = {
+  def toJson(season: Season) : String = {
 mapper.writeValueAsString(season)

[ambari] 26/36: AMBARI-22359 : Fix Serialization issues in Metric Definition Service (avijayan).

2018-03-01 Thread avijayan 
This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-feature-AMBARI-23100
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit aba88d8b310d66326e3a274cfbabe3432a1e706e
Author: Aravindan Vijayan 
AuthorDate: Thu Nov 2 14:41:38 2017 -0700

AMBARI-22359 : Fix Serialization issues in Metric Definition Service 
(avijayan).
---
 .../src/main/resources/config.yml  |  4 +-
 .../adservice/app/AnomalyDetectionAppConfig.scala  | 10 ++---
 .../ambari/metrics/adservice/common/Season.scala   |  4 +-
 .../MetricCollectorConfiguration.scala | 10 -
 ... => MetricDefinitionServiceConfiguration.scala} |  2 +-
 .../adservice/db/PhoenixAnomalyStoreAccessor.scala |  8 ++--
 .../adservice/metadata/ADMetadataProvider.scala| 12 ++---
 .../adservice/metadata/MetricDefinition.scala  | 52 ++
 ...Service.scala => MetricDefinitionService.scala} |  2 +-
 ...mpl.scala => MetricDefinitionServiceImpl.scala} | 34 --
 .../metadata/MetricSourceDefinition.scala  | 38 +---
 .../app/AnomalyDetectionAppConfigTest.scala|  2 +-
 .../metrics/adservice/common/SeasonTest.scala  |  4 +-
 ...est.scala => MetricDefinitionServiceTest.scala} | 34 +++---
 .../metadata/MetricSourceDefinitionTest.scala  | 11 +++--
 15 files changed, 126 insertions(+), 101 deletions(-)

diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
index 6953745..920c50c 100644
--- 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/resources/config.yml
@@ -20,8 +20,8 @@ server:
 logging:
   type: external
 
-metricManagerService:
-  inputDefinitionDirectory: /etc/adservice/conf/input-definitions-directory
+metricDefinitionService:
+  inputDefinitionDirectory: /etc/ambari-metrics-anomaly-detection/conf
 
 metricsCollector:
   hostPortList: host1:6188,host2:6188
diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
index be8d027..c1ef0d1 100644
--- 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/app/AnomalyDetectionAppConfig.scala
@@ -20,7 +20,7 @@ package org.apache.ambari.metrics.adservice.app
 
 import javax.validation.Valid
 
-import 
org.apache.ambari.metrics.adservice.configuration.{AdServiceConfiguration, 
HBaseConfiguration, MetricCollectorConfiguration, 
MetricManagerServiceConfiguration}
+import 
org.apache.ambari.metrics.adservice.configuration.{AdServiceConfiguration, 
HBaseConfiguration, MetricCollectorConfiguration, 
MetricDefinitionServiceConfiguration}
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -35,7 +35,7 @@ class AnomalyDetectionAppConfig extends Configuration {
Metric Definition Service configuration
 */
   @Valid
-  private val metricManagerServiceConfiguration = new 
MetricManagerServiceConfiguration
+  private val metricDefinitionServiceConfiguration = new 
MetricDefinitionServiceConfiguration
 
   @Valid
   private val metricCollectorConfiguration = new MetricCollectorConfiguration
@@ -53,9 +53,9 @@ class AnomalyDetectionAppConfig extends Configuration {
 HBaseConfiguration.getHBaseConf
   }
 
-  @JsonProperty("metricManagerService")
-  def getMetricManagerServiceConfiguration: MetricManagerServiceConfiguration 
= {
-metricManagerServiceConfiguration
+  @JsonProperty("metricDefinitionService")
+  def getMetricDefinitionServiceConfiguration: 
MetricDefinitionServiceConfiguration = {
+metricDefinitionServiceConfiguration
   }
 
   @JsonProperty("adQueryService")
diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
index aba2587..f875e3b 100644
--- 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/Season.scala
@@ -112,11 +112,11 @@ object Season {
 validSeasons.toList
   }
 
-  def serialize(season: Season) : String = {
+  def toJson(season: Season) : String = {
 mapper.writeValueAsString(season)