From caa6a0de5a9e3ad3a7fb0f66a2e0849889bd1906 Mon Sep 17 00:00:00 2001
From: Brandon Fergerson <bfergerson@apache.org>
Date: Tue, 9 Aug 2022 06:27:20 +0400
Subject: [PATCH] refactor: make more consistent (#9439)

---
 .../provider/trace/parser/ISegmentParserListenerManager.java  | 4 ++++
 .../provider/trace/parser/SegmentParserListenerManager.java   | 3 ++-
 .../storage/plugin/elasticsearch/base/MetricsEsDAO.java       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java
index e6aaed4914..8d3f41b114 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java
@@ -20,6 +20,10 @@ package org.apache.skywalking.oap.server.analyzer.provider.trace.parser;
 
 import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.AnalysisListenerFactory;
 
+import java.util.List;
+
 public interface ISegmentParserListenerManager {
     void add(AnalysisListenerFactory analysisListenerFactory);
+
+    List<AnalysisListenerFactory> getSpanListenerFactories();
 }
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java
index ef1f07a762..6663e70a5b 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java
@@ -36,7 +36,8 @@ public class SegmentParserListenerManager implements ISegmentParserListenerManag
         spanListenerFactories.add(analysisListenerFactory);
     }
 
-    List<AnalysisListenerFactory> getSpanListenerFactories() {
+    @Override
+    public List<AnalysisListenerFactory> getSpanListenerFactories() {
         return spanListenerFactories;
     }
 }
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
index 7ff7960f10..5d1290f7ec 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
@@ -44,7 +44,7 @@ import org.joda.time.DateTime;
 public class MetricsEsDAO extends EsDAO implements IMetricsDAO {
     protected final StorageBuilder<Metrics> storageBuilder;
 
-    protected MetricsEsDAO(ElasticSearchClient client,
+    public MetricsEsDAO(ElasticSearchClient client,
                            StorageBuilder<Metrics> storageBuilder) {
         super(client);
         this.storageBuilder = storageBuilder;
-- 
GitLab