You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2022/11/08 15:49:25 UTC
[ambari-metrics] branch master updated: AMBARI-25516. Missing @Override on methods (#55)
This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new dc179a8 AMBARI-25516. Missing @Override on methods (#55)
dc179a8 is described below
commit dc179a8e829b044f29251de466db126fe33cef74
Author: lucasbak <lu...@gmail.com>
AuthorDate: Tue Nov 8 16:49:20 2022 +0100
AMBARI-25516. Missing @Override on methods (#55)
---
.../metrics2/sink/timeline/AppCookieManager.java | 2 ++
.../sink/timeline/HadoopTimelineMetricsSink.java | 10 ++++------
.../host/aggregator/AggregatorApplication.java | 6 +-----
.../sink/kafka/KafkaTimelineMetricsReporter.java | 9 ++++-----
.../core/timeline/HBaseTimelineMetricsService.java | 1 +
.../core/timeline/TimelineMetricStoreWatcher.java | 16 +++++++---------
.../aggregators/AbstractTimelineAggregator.java | 3 +++
.../core/timeline/query/DefaultCondition.java | 21 +++++++++++++++++++++
.../timeline/query/DefaultPhoenixDataSource.java | 2 ++
.../core/timeline/query/MetadataQueryCondition.java | 1 +
.../upgrade/core/AbstractPhoenixMetricsCopier.java | 1 +
.../upgrade/core/MetricsDataMigrationLauncher.java | 14 ++++++--------
12 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AppCookieManager.java b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AppCookieManager.java
index bcba238..85ab89e 100644
--- a/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AppCookieManager.java
+++ b/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AppCookieManager.java
@@ -206,10 +206,12 @@ public class AppCookieManager {
private static class EmptyJaasCredentials implements Credentials {
+ @Override
public String getPassword() {
return null;
}
+ @Override
public Principal getUserPrincipal() {
return null;
}
diff --git a/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java b/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
index 0a38bdd..6021c30 100644
--- a/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
+++ b/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java
@@ -68,12 +68,10 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple
// Cache the rpc port used and the suffix to use if the port tag is found
private Map<String, String> rpcPortSuffixes = new HashMap<>(10);
- private final ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactory() {
- public Thread newThread(Runnable r) {
- Thread t = Executors.defaultThreadFactory().newThread(r);
- t.setDaemon(true);
- return t;
- }
+ private final ExecutorService executorService = Executors.newSingleThreadExecutor(r -> {
+ Thread t = Executors.defaultThreadFactory().newThread(r);
+ t.setDaemon(true);
+ return t;
});
private int hostInMemoryAggregationPort;
private boolean hostInMemoryAggregationEnabled;
diff --git a/ambari-metrics-host-aggregator/src/main/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorApplication.java b/ambari-metrics-host-aggregator/src/main/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorApplication.java
index b5a4026..604586b 100644
--- a/ambari-metrics-host-aggregator/src/main/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorApplication.java
+++ b/ambari-metrics-host-aggregator/src/main/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorApplication.java
@@ -240,11 +240,7 @@ public class AggregatorApplication {
app.startWebServerAndPublishersThreads();
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- app.stop();
- }
- });
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> app.stop()));
}
private void startWebServerAndPublishersThreads() {
diff --git a/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java b/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java
index cf529ea..782b8d2 100644
--- a/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java
+++ b/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java
@@ -238,10 +238,12 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
}
}
+ @Override
public String getMBeanName() {
return "kafka:type=org.apache.hadoop.metrics2.sink.kafka.KafkaTimelineMetricsReporter";
}
+ @Override
public synchronized void startReporter(long period) {
synchronized (lock) {
if (initialized && !running) {
@@ -252,6 +254,7 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
}
}
+ @Override
public synchronized void stopReporter() {
synchronized (lock) {
if (initialized && running) {
@@ -321,11 +324,7 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
for (Entry<MetricName, Metric> entry : metrics) {
final MetricName metricName = entry.getKey();
final Metric metric = entry.getValue();
- Context context = new Context() {
- public List<TimelineMetric> getTimelineMetricList() {
- return metricsList;
- }
- };
+ Context context = () -> metricsList;
metric.processWith(this, metricName, context);
}
} catch (Throwable t) {
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/HBaseTimelineMetricsService.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/HBaseTimelineMetricsService.java
index 3619af6..0a3531c 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/HBaseTimelineMetricsService.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/HBaseTimelineMetricsService.java
@@ -403,6 +403,7 @@ public class HBaseTimelineMetricsService extends AbstractService implements Time
return metricsFunctions;
}
+ @Override
public TimelinePutResponse putMetricsSkipCache(TimelineMetrics metrics) throws SQLException, IOException {
TimelinePutResponse response = new TimelinePutResponse();
hBaseAccessor.insertMetricRecordsWithMetadata(metricMetadataManager, metrics, true);
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricStoreWatcher.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricStoreWatcher.java
index ba7ce44..e886c70 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricStoreWatcher.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/TimelineMetricStoreWatcher.java
@@ -98,15 +98,13 @@ public class TimelineMetricStoreWatcher implements Runnable {
final TimelineMetrics metrics = new TimelineMetrics();
metrics.setMetrics(Collections.singletonList(fakeMetric));
- Callable<TimelineMetric> task = new Callable<TimelineMetric>() {
- public TimelineMetric call() throws Exception {
- timelineMetricStore.putMetricsSkipCache(metrics);
- TimelineMetrics timelineMetrics = timelineMetricStore.getTimelineMetrics(
- Collections.singletonList(FAKE_METRIC_NAME), Collections.singletonList(FAKE_HOSTNAME),
- FAKE_APP_ID, null, startTime - delay * 2 * 1000,
- startTime + delay * 2 * 1000, Precision.SECONDS, 1, true, null, null);
- return timelineMetrics.getMetrics().get(0);
- }
+ Callable<TimelineMetric> task = () -> {
+ timelineMetricStore.putMetricsSkipCache(metrics);
+ TimelineMetrics timelineMetrics = timelineMetricStore.getTimelineMetrics(
+ Collections.singletonList(FAKE_METRIC_NAME), Collections.singletonList(FAKE_HOSTNAME),
+ FAKE_APP_ID, null, startTime - delay * 2 * 1000,
+ startTime + delay * 2 * 1000, Precision.SECONDS, 1, true, null, null);
+ return timelineMetrics.getMetrics().get(0);
};
Future<TimelineMetric> future = executor.submit(task);
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/AbstractTimelineAggregator.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/AbstractTimelineAggregator.java
index ffa4827..9d4cab4 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/AbstractTimelineAggregator.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/aggregators/AbstractTimelineAggregator.java
@@ -253,6 +253,7 @@ public abstract class AbstractTimelineAggregator implements TimelineMetricAggreg
* @param startTime Sample start time
* @param endTime Sample end time
*/
+ @Override
public boolean doWork(long startTime, long endTime) {
LOG.info("Start aggregation cycle @ " + new Date() + ", " +
"startTime = " + new Date(startTime) + ", endTime = " + new Date(endTime));
@@ -357,6 +358,7 @@ public abstract class AbstractTimelineAggregator implements TimelineMetricAggreg
}
+ @Override
public Long getSleepIntervalMillis() {
return sleepIntervalMillis;
}
@@ -373,6 +375,7 @@ public abstract class AbstractTimelineAggregator implements TimelineMetricAggreg
return getCheckpointCutOffMultiplier() * getSleepIntervalMillis();
}
+ @Override
public boolean isDisabled() {
return metricsConf.getBoolean(aggregatorDisableParam, false);
}
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultCondition.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultCondition.java
index 46204fc..3ced0d8 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultCondition.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultCondition.java
@@ -79,18 +79,22 @@ public class DefaultCondition implements Condition {
this.grouped = grouped;
}
+ @Override
public String getStatement() {
return statement;
}
+ @Override
public void setStatement(String statement) {
this.statement = statement;
}
+ @Override
public List<String> getMetricNames() {
return metricNames == null || metricNames.isEmpty() ? null : metricNames;
}
+ @Override
public StringBuilder getConditionClause() {
StringBuilder sb = new StringBuilder();
boolean appendConjunction = appendUuidClause(sb);
@@ -114,18 +118,22 @@ public class DefaultCondition implements Condition {
return appendConjunction;
}
+ @Override
public List<String> getHostnames() {
return hostnames;
}
+ @Override
public Precision getPrecision() {
return precision;
}
+ @Override
public void setPrecision(Precision precision) {
this.precision = precision;
}
+ @Override
public String getAppId() {
if (appId != null && !appId.isEmpty()) {
if (!(appId.equals("HOST") || appId.equals("FLUME_HANDLER"))) {
@@ -137,6 +145,7 @@ public class DefaultCondition implements Condition {
return null;
}
+ @Override
public String getInstanceId() {
return instanceId == null || instanceId.isEmpty() ? null : instanceId;
}
@@ -144,6 +153,7 @@ public class DefaultCondition implements Condition {
/**
* Convert to millis.
*/
+ @Override
public Long getStartTime() {
if (startTime == null) {
return null;
@@ -154,6 +164,7 @@ public class DefaultCondition implements Condition {
}
}
+ @Override
public Long getEndTime() {
if (endTime == null) {
return null;
@@ -165,6 +176,7 @@ public class DefaultCondition implements Condition {
}
}
+ @Override
public void setNoLimit() {
this.noLimit = true;
}
@@ -174,6 +186,7 @@ public class DefaultCondition implements Condition {
return false;
}
+ @Override
public Integer getLimit() {
if (noLimit) {
return null;
@@ -181,14 +194,17 @@ public class DefaultCondition implements Condition {
return limit == null ? PhoenixHBaseAccessor.RESULTSET_LIMIT : limit;
}
+ @Override
public boolean isGrouped() {
return grouped;
}
+ @Override
public boolean isPointInTime() {
return getStartTime() == null && getEndTime() == null;
}
+ @Override
public boolean isEmpty() {
return (metricNames == null || metricNames.isEmpty())
&& (hostnames == null || hostnames.isEmpty())
@@ -198,18 +214,22 @@ public class DefaultCondition implements Condition {
&& endTime == null;
}
+ @Override
public Integer getFetchSize() {
return fetchSize;
}
+ @Override
public void setFetchSize(Integer fetchSize) {
this.fetchSize = fetchSize;
}
+ @Override
public void addOrderByColumn(String column) {
orderByColumns.add(column);
}
+ @Override
public String getOrderByClause(boolean asc) {
String orderByStr = " ORDER BY ";
if (!orderByColumns.isEmpty()) {
@@ -295,6 +315,7 @@ public class DefaultCondition implements Condition {
return false;
}
+ @Override
public void setMetricNamesNotCondition(boolean metricNamesNotCondition) {
this.metricNamesNotCondition = metricNamesNotCondition;
}
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultPhoenixDataSource.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultPhoenixDataSource.java
index 5c0a4b5..1c09bc7 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultPhoenixDataSource.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/DefaultPhoenixDataSource.java
@@ -62,6 +62,7 @@ public class DefaultPhoenixDataSource implements PhoenixConnectionProvider {
* @return @HBaseAdmin
* @throws IOException
*/
+ @Override
public HBaseAdmin getHBaseAdmin() throws IOException {
return (HBaseAdmin) ConnectionFactory.createConnection(hbaseConf).getAdmin();
}
@@ -75,6 +76,7 @@ public class DefaultPhoenixDataSource implements PhoenixConnectionProvider {
*
* @return @java.sql.Connection
*/
+ @Override
public Connection getConnection() throws SQLException {
LOG.debug("Metric store connection url: " + url);
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/MetadataQueryCondition.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/MetadataQueryCondition.java
index 0f6f611..08404b2 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/MetadataQueryCondition.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/query/MetadataQueryCondition.java
@@ -38,6 +38,7 @@ public class MetadataQueryCondition extends TransientMetricCondition {
isMetricMetadataCondition = false;
}
+ @Override
public StringBuilder getConditionClause() {
StringBuilder sb = new StringBuilder();
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/AbstractPhoenixMetricsCopier.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/AbstractPhoenixMetricsCopier.java
index 6782930..3d2002b 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/AbstractPhoenixMetricsCopier.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/AbstractPhoenixMetricsCopier.java
@@ -49,6 +49,7 @@ public abstract class AbstractPhoenixMetricsCopier implements Runnable {
this.processedMetricsFile = outputStream;
}
+ @Override
public void run(){
LOG.info(String.format("Copying %s metrics from %s to %s", metricNames, inputTable, outputTable));
long startTimer = System.currentTimeMillis();
diff --git a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
index 1dd380c..3a25aee 100644
--- a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
+++ b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/timeline/upgrade/core/MetricsDataMigrationLauncher.java
@@ -306,15 +306,13 @@ public class MetricsDataMigrationLauncher {
try {
//Setup shutdown hook for metadata save.
MetricsDataMigrationLauncher finalDataMigrationLauncher = dataMigrationLauncher;
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- try {
- finalDataMigrationLauncher.saveMetadata();
- } catch (SQLException e) {
- LOG.error("Exception during metadata saving, exiting...", e);
- }
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+ try {
+ finalDataMigrationLauncher.saveMetadata();
+ } catch (SQLException e) {
+ LOG.error("Exception during metadata saving, exiting...", e);
}
- });
+ }));
dataMigrationLauncher.runMigration(timeoutInMinutes);
} catch (IOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org