Optimize the package name of metrics (#80)

opensource4you · Oct 28, 2021 · 6a8d1db · 6a8d1db
1 parent 52fb542
commit 6a8d1db
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 29 deletions.
diff --git a/app/src/main/java/org/astraea/App.java b/app/src/main/java/org/astraea/App.java
@@ -5,7 +5,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.astraea.metrics.kafka.KafkaMetricClientApp;
+import org.astraea.metrics.KafkaMetricClientApp;
 import org.astraea.performance.Performance;
 import org.astraea.topic.ReplicaCollie;
 import org.astraea.topic.TopicExplorer;

diff --git a/...afka/metrics/modifiers/HasBeanObject.java → ...va/org/astraea/metrics/HasBeanObject.java b/...afka/metrics/modifiers/HasBeanObject.java → ...va/org/astraea/metrics/HasBeanObject.java
@@ -1,4 +1,4 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics;
 
 import org.astraea.metrics.jmx.BeanObject;
 

diff --git a/...a/metrics/kafka/KafkaMetricClientApp.java → ...astraea/metrics/KafkaMetricClientApp.java b/...a/metrics/kafka/KafkaMetricClientApp.java → ...astraea/metrics/KafkaMetricClientApp.java
@@ -1,4 +1,4 @@
-package org.astraea.metrics.kafka;
+package org.astraea.metrics;
 
 import com.beust.jcommander.Parameter;
 import java.net.MalformedURLException;
@@ -13,7 +13,8 @@
 import javax.management.remote.JMXServiceURL;
 import org.astraea.argument.ArgumentUtil;
 import org.astraea.metrics.jmx.MBeanClient;
-import org.astraea.metrics.kafka.metrics.BrokerTopicMetricsResult;
+import org.astraea.metrics.kafka.BrokerTopicMetricsResult;
+import org.astraea.metrics.kafka.KafkaMetrics;
 
 public final class KafkaMetricClientApp {
 

diff --git a/...kafka/metrics/modifiers/HasJvmMemory.java → ...rg/astraea/metrics/java/HasJvmMemory.java b/...kafka/metrics/modifiers/HasJvmMemory.java → ...rg/astraea/metrics/java/HasJvmMemory.java
@@ -1,7 +1,8 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.java;
 
 import java.lang.management.MemoryUsage;
 import javax.management.openmbean.CompositeData;
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasJvmMemory extends HasBeanObject {
 

diff --git a/...ics/modifiers/HasOperatingSystemInfo.java → .../metrics/java/HasOperatingSystemInfo.java b/...ics/modifiers/HasOperatingSystemInfo.java → .../metrics/java/HasOperatingSystemInfo.java
@@ -1,4 +1,6 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.java;
+
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasOperatingSystemInfo extends HasBeanObject {
 

diff --git a/...traea/metrics/java/metrics/JvmMemory.java → ...a/org/astraea/metrics/java/JvmMemory.java b/...traea/metrics/java/metrics/JvmMemory.java → ...a/org/astraea/metrics/java/JvmMemory.java
@@ -1,8 +1,7 @@
-package org.astraea.metrics.java.metrics;
+package org.astraea.metrics.java;
 
 import java.lang.management.MemoryUsage;
 import org.astraea.metrics.jmx.BeanObject;
-import org.astraea.metrics.kafka.metrics.modifiers.HasJvmMemory;
 
 public class JvmMemory implements HasJvmMemory {
 

diff --git a/...cs/kafka/metrics/OperatingSystemInfo.java → ...aea/metrics/java/OperatingSystemInfo.java b/...cs/kafka/metrics/OperatingSystemInfo.java → ...aea/metrics/java/OperatingSystemInfo.java
@@ -1,8 +1,7 @@
-package org.astraea.metrics.kafka.metrics;
+package org.astraea.metrics.java;
 
 import java.util.Map;
 import org.astraea.metrics.jmx.BeanObject;
-import org.astraea.metrics.kafka.metrics.modifiers.HasOperatingSystemInfo;
 
 public class OperatingSystemInfo implements HasOperatingSystemInfo {
 

diff --git a/...fka/metrics/BrokerTopicMetricsResult.java → ...trics/kafka/BrokerTopicMetricsResult.java b/...fka/metrics/BrokerTopicMetricsResult.java → ...trics/kafka/BrokerTopicMetricsResult.java
@@ -1,9 +1,8 @@
-package org.astraea.metrics.kafka.metrics;
+package org.astraea.metrics.kafka;
 
 import java.util.Map;
 import java.util.Objects;
 import org.astraea.metrics.jmx.BeanObject;
-import org.astraea.metrics.kafka.metrics.modifiers.*;
 
 public class BrokerTopicMetricsResult implements HasCount, HasEventType, HasRate {
 

diff --git a/...ics/kafka/metrics/modifiers/HasCount.java → ...a/org/astraea/metrics/kafka/HasCount.java b/...ics/kafka/metrics/modifiers/HasCount.java → ...a/org/astraea/metrics/kafka/HasCount.java
@@ -1,4 +1,6 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.kafka;
+
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasCount extends HasBeanObject {
   default long count() {

diff --git a/...kafka/metrics/modifiers/HasEventType.java → ...g/astraea/metrics/kafka/HasEventType.java b/...kafka/metrics/modifiers/HasEventType.java → ...g/astraea/metrics/kafka/HasEventType.java
@@ -1,4 +1,6 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.kafka;
+
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasEventType extends HasBeanObject {
   default String eventType() {

diff --git a/...fka/metrics/modifiers/HasPercentiles.java → ...astraea/metrics/kafka/HasPercentiles.java b/...fka/metrics/modifiers/HasPercentiles.java → ...astraea/metrics/kafka/HasPercentiles.java
@@ -1,4 +1,6 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.kafka;
+
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasPercentiles extends HasBeanObject {
 

diff --git a/...rics/kafka/metrics/modifiers/HasRate.java → ...va/org/astraea/metrics/kafka/HasRate.java b/...rics/kafka/metrics/modifiers/HasRate.java → ...va/org/astraea/metrics/kafka/HasRate.java
@@ -1,6 +1,7 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.kafka;
 
 import java.util.concurrent.TimeUnit;
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasRate extends HasBeanObject {
   default double meanRate() {

diff --git a/...afka/metrics/modifiers/HasStatistics.java → .../astraea/metrics/kafka/HasStatistics.java b/...afka/metrics/modifiers/HasStatistics.java → .../astraea/metrics/kafka/HasStatistics.java
@@ -1,4 +1,6 @@
-package org.astraea.metrics.kafka.metrics.modifiers;
+package org.astraea.metrics.kafka;
+
+import org.astraea.metrics.HasBeanObject;
 
 public interface HasStatistics extends HasBeanObject {
 

diff --git a/app/src/main/java/org/astraea/metrics/kafka/KafkaMetrics.java b/app/src/main/java/org/astraea/metrics/kafka/KafkaMetrics.java
@@ -4,13 +4,11 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.astraea.metrics.java.metrics.JvmMemory;
+import org.astraea.metrics.java.JvmMemory;
+import org.astraea.metrics.java.OperatingSystemInfo;
 import org.astraea.metrics.jmx.BeanObject;
 import org.astraea.metrics.jmx.BeanQuery;
 import org.astraea.metrics.jmx.MBeanClient;
-import org.astraea.metrics.kafka.metrics.BrokerTopicMetricsResult;
-import org.astraea.metrics.kafka.metrics.OperatingSystemInfo;
-import org.astraea.metrics.kafka.metrics.TotalTimeMs;
 
 public final class KafkaMetrics {
 

diff --git a/...ea/metrics/kafka/metrics/TotalTimeMs.java → ...rg/astraea/metrics/kafka/TotalTimeMs.java b/...ea/metrics/kafka/metrics/TotalTimeMs.java → ...rg/astraea/metrics/kafka/TotalTimeMs.java
@@ -1,10 +1,7 @@
-package org.astraea.metrics.kafka.metrics;
+package org.astraea.metrics.kafka;
 
 import java.util.Map;
 import org.astraea.metrics.jmx.BeanObject;
-import org.astraea.metrics.kafka.metrics.modifiers.HasCount;
-import org.astraea.metrics.kafka.metrics.modifiers.HasPercentiles;
-import org.astraea.metrics.kafka.metrics.modifiers.HasStatistics;
 
 public class TotalTimeMs implements HasPercentiles, HasCount, HasStatistics {
 

diff --git a/app/src/test/java/org/astraea/metrics/kafka/KafkaMetricClientAppTest.java b/app/src/test/java/org/astraea/metrics/kafka/KafkaMetricClientAppTest.java
@@ -5,6 +5,7 @@
 import com.beust.jcommander.ParameterException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import org.astraea.metrics.KafkaMetricClientApp;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/app/src/test/java/org/astraea/metrics/kafka/KafkaMetricsTest.java b/app/src/test/java/org/astraea/metrics/kafka/KafkaMetricsTest.java
@@ -11,11 +11,9 @@
 import javax.management.remote.JMXConnectorServer;
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
-import org.astraea.metrics.java.metrics.JvmMemory;
+import org.astraea.metrics.java.JvmMemory;
+import org.astraea.metrics.java.OperatingSystemInfo;
 import org.astraea.metrics.jmx.MBeanClient;
-import org.astraea.metrics.kafka.metrics.BrokerTopicMetricsResult;
-import org.astraea.metrics.kafka.metrics.OperatingSystemInfo;
-import org.astraea.metrics.kafka.metrics.TotalTimeMs;
 import org.astraea.service.RequireBrokerCluster;
 import org.astraea.topic.TopicAdmin;
 import org.junit.jupiter.api.AfterEach;