Merge pull request #3493 from HattoriHenzo/eventmesh-3491

mytang0 · web-flow · commit 228cc82a041d · 2023-03-23T13:53:39.000+08:00
[ISSUE #3491] Refactor class StandaloneAdmin and RocketMQAdmin
diff --git a/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/admin/Admin.java b/eventmesh-storage/eventmesh-storage-api/src/main/java/org/apache/eventmesh/api/admin/Admin.java
@@ -37,7 +37,7 @@ public interface Admin extends LifeCycle {
     /**
      * Initializes admin api service.
      */
-    void init(Properties keyValue) throws Exception;
+    void init(Properties properties) throws Exception;
 
     /**
      * Get the list of topics.
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdmin.java b/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdmin.java
@@ -59,7 +59,7 @@ public class RocketMQAdmin implements Admin {
     private int numOfQueue = 4;
     private int queuePermission = 6;
 
-    public RocketMQAdmin(Properties properties) {
+    public RocketMQAdmin() {
         isStarted = new AtomicBoolean(false);
 
         ConfigService configService = ConfigService.getInstance();
@@ -98,7 +98,8 @@ public void shutdown() {
     }
 
     @Override
-    public void init(Properties keyValue) throws Exception {
+    public void init(Properties properties) {
+
     }
 
     @Override
@@ -163,11 +164,11 @@ public void deleteTopic(String topicName) throws Exception {
     }
 
     @Override
-    public List<CloudEvent> getEvent(String topicName, int offset, int length) throws Exception {
+    public List<CloudEvent> getEvent(String topicName, int offset, int length) {
         return null;
     }
 
     @Override
-    public void publish(CloudEvent cloudEvent) throws Exception {
+    public void publish(CloudEvent cloudEvent) {
     }
 }
diff --git a/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdminAdaptor.java b/eventmesh-storage/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/admin/RocketMQAdminAdaptor.java
@@ -29,9 +29,10 @@
 
 public class RocketMQAdminAdaptor implements Admin {
 
-    private RocketMQAdmin admin;
+    private final RocketMQAdmin admin;
 
     public RocketMQAdminAdaptor() {
+        admin = new RocketMQAdmin();
     }
 
     @Override
@@ -55,8 +56,8 @@ public void shutdown() {
     }
 
     @Override
-    public void init(Properties keyValue) throws Exception {
-        admin = new RocketMQAdmin(keyValue);
+    public void init(Properties properties) throws Exception {
+        admin.init(properties);
     }
 
     @Override
@@ -75,12 +76,12 @@ public void deleteTopic(String topicName) throws Exception {
     }
 
     @Override
-    public List<CloudEvent> getEvent(String topicName, int offset, int length) throws Exception {
+    public List<CloudEvent> getEvent(String topicName, int offset, int length) {
         return admin.getEvent(topicName, offset, length);
     }
 
     @Override
-    public void publish(CloudEvent cloudEvent) throws Exception {
+    public void publish(CloudEvent cloudEvent) {
         admin.publish(cloudEvent);
     }
 }
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdmin.java b/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdmin.java
@@ -37,10 +37,9 @@
 public class StandaloneAdmin implements Admin {
 
     private final AtomicBoolean isStarted;
-
     private final StandaloneBroker standaloneBroker;
 
-    public StandaloneAdmin(Properties properties) {
+    public StandaloneAdmin() {
         this.standaloneBroker = StandaloneBroker.getInstance();
         this.isStarted = new AtomicBoolean(false);
     }
@@ -66,20 +65,21 @@ public void shutdown() {
     }
 
     @Override
-    public void init(Properties keyValue) throws Exception {
+    public void init(Properties properties) throws Exception {
+
     }
 
     @Override
     public List<TopicProperties> getTopic() throws Exception {
         ConcurrentHashMap<TopicMetadata, MessageQueue> messageContainer = this.standaloneBroker.getMessageContainer();
         List<TopicProperties> topicList = new ArrayList<>();
-        for (TopicMetadata topicMetadata : messageContainer.keySet()) {
+        messageContainer.keySet().forEach(topicMetadata -> {
             MessageQueue messageQueue = messageContainer.get(topicMetadata);
             topicList.add(new TopicProperties(
                 topicMetadata.getTopicName(),
                 messageQueue.getPutIndex() - messageQueue.getTakeIndex()
             ));
-        }
+        });
         topicList.sort(Comparator.comparing(t -> t.name));
         return topicList;
     }
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminAdaptor.java b/eventmesh-storage/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminAdaptor.java
@@ -29,9 +29,10 @@
 
 public class StandaloneAdminAdaptor implements Admin {
 
-    private StandaloneAdmin admin;
+    private final StandaloneAdmin admin;
 
     public StandaloneAdminAdaptor() {
+        admin = new StandaloneAdmin();
     }
 
     @Override
@@ -55,8 +56,8 @@ public void shutdown() {
     }
 
     @Override
-    public void init(Properties keyValue) throws Exception {
-        admin = new StandaloneAdmin(keyValue);
+    public void init(Properties properties) throws Exception {
+        admin.init(properties);
     }
 
     @Override
diff --git a/eventmesh-storage/eventmesh-storage-standalone/src/test/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminTest.java b/eventmesh-storage/eventmesh-storage-standalone/src/test/java/org/apache/eventmesh/storage/standalone/admin/StandaloneAdminTest.java
@@ -30,7 +30,6 @@
 import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;
 
 import java.util.List;
-import java.util.Properties;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -115,7 +114,7 @@ private void initStaticInstance() {
         try (MockedStatic<StandaloneBroker> standaloneBrokerMockedStatic = Mockito.mockStatic(StandaloneBroker.class)) {
             standaloneBrokerMockedStatic.when(StandaloneBroker::getInstance).thenReturn(standaloneBroker);
             Mockito.when(standaloneBroker.getMessageContainer()).thenReturn(createDefaultMessageContainer());
-            standaloneAdmin = new StandaloneAdmin(new Properties());
+            standaloneAdmin = new StandaloneAdmin();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public class RocketMQAdmin implements Admin {`
`59`	`59`	`private int numOfQueue = 4;`
`60`	`60`	`private int queuePermission = 6;`
`61`	`61`
`62`		`- public RocketMQAdmin(Properties properties) {`
	`62`	`+ public RocketMQAdmin() {`
`63`	`63`	`isStarted = new AtomicBoolean(false);`
`64`	`64`
`65`	`65`	`ConfigService configService = ConfigService.getInstance();`
`@@ -98,7 +98,8 @@ public void shutdown() {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public void init(Properties keyValue) throws Exception {`
	`101`	`+ public void init(Properties properties) {`
	`102`	`+`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`@Override`
`@@ -163,11 +164,11 @@ public void deleteTopic(String topicName) throws Exception {`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`@Override`
`166`		`- public List<CloudEvent> getEvent(String topicName, int offset, int length) throws Exception {`
	`167`	`+ public List<CloudEvent> getEvent(String topicName, int offset, int length) {`
`167`	`168`	`return null;`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`@Override`
`171`		`- public void publish(CloudEvent cloudEvent) throws Exception {`
	`172`	`+ public void publish(CloudEvent cloudEvent) {`
`172`	`173`	`}`
`173`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,10 @@`
`29`	`29`
`30`	`30`	`public class RocketMQAdminAdaptor implements Admin {`
`31`	`31`
`32`		`- private RocketMQAdmin admin;`
	`32`	`+ private final RocketMQAdmin admin;`
`33`	`33`
`34`	`34`	`public RocketMQAdminAdaptor() {`
	`35`	`+ admin = new RocketMQAdmin();`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`@Override`
`@@ -55,8 +56,8 @@ public void shutdown() {`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`@Override`
`58`		`- public void init(Properties keyValue) throws Exception {`
`59`		`- admin = new RocketMQAdmin(keyValue);`
	`59`	`+ public void init(Properties properties) throws Exception {`
	`60`	`+ admin.init(properties);`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`@Override`
`@@ -75,12 +76,12 @@ public void deleteTopic(String topicName) throws Exception {`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`@Override`
`78`		`- public List<CloudEvent> getEvent(String topicName, int offset, int length) throws Exception {`
	`79`	`+ public List<CloudEvent> getEvent(String topicName, int offset, int length) {`
`79`	`80`	`return admin.getEvent(topicName, offset, length);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`@Override`
`83`		`- public void publish(CloudEvent cloudEvent) throws Exception {`
	`84`	`+ public void publish(CloudEvent cloudEvent) {`
`84`	`85`	`admin.publish(cloudEvent);`
`85`	`86`	`}`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`	`import org.apache.eventmesh.storage.standalone.broker.model.MessageEntity;`
`31`	`31`
`32`	`32`	`import java.util.List;`
`33`		`-import java.util.Properties;`
`34`	`33`
`35`	`34`	`import org.junit.Assert;`
`36`	`35`	`import org.junit.Before;`
`@@ -115,7 +114,7 @@ private void initStaticInstance() {`
`115`	`114`	`try (MockedStatic<StandaloneBroker> standaloneBrokerMockedStatic = Mockito.mockStatic(StandaloneBroker.class)) {`
`116`	`115`	`standaloneBrokerMockedStatic.when(StandaloneBroker::getInstance).thenReturn(standaloneBroker);`
`117`	`116`	`Mockito.when(standaloneBroker.getMessageContainer()).thenReturn(createDefaultMessageContainer());`
`118`		`- standaloneAdmin = new StandaloneAdmin(new Properties());`
	`117`	`+ standaloneAdmin = new StandaloneAdmin();`
`119`	`118`	`}`
`120`	`119`	`}`
`121`	`120`	`}`