implement classes in core are not Service Beans

apache · Mar 2, 2024 · bc51729 · bc51729
1 parent e99e903
commit bc51729
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 122 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -24,11 +24,6 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-web</artifactId>
  </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
 
  <!-- Utility -->
  <dependency>

diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -30,11 +30,6 @@
  <artifactId>eventmesh-dashboard-service</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  </dependency>
- <dependency>
- <groupId>org.apache.eventmesh.dashboard.core</groupId>
- <artifactId>eventmesh-dashboard-core</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
 
  <!-- AOP -->
  <dependency>

diff --git a/...e/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java b/...e/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java
@@ -24,7 +24,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@SpringBootApplication(scanBasePackages = {"org.apache.eventmesh.dashboard.console", "org.apache.eventmesh.dashboard.core"})
+@SpringBootApplication
 @EnableTransactionManagement
 public class EventMeshDashboardApplication {
 

diff --git a/...src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java b/...src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java
@@ -19,7 +19,6 @@
 
 import org.apache.eventmesh.dashboard.service.meta.ConnectionCore;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,7 +29,9 @@
 @RestController
 public class ConnectionController {
 
- @Autowired
+ /**
+ * TODO expose implement by FunctionManager
+ */
  ConnectionCore connectionCore;
 
  /**

diff --git a/...le/src/main/java/org/apache/eventmesh/dashboard/console/controller/MetricsController.java b/...le/src/main/java/org/apache/eventmesh/dashboard/console/controller/MetricsController.java
@@ -24,8 +24,10 @@
 
 @RestController
 public class MetricsController {
+
  @GetMapping("/druid/stat")
  public Object druidStat() {
  return DruidStatManagerFacade.getInstance().getDataSourceStatDataList();
  }
+
 }
diff --git a/...c/main/java/org/apache/eventmesh/dashboard/console/controller/SubscriptionController.java b/...c/main/java/org/apache/eventmesh/dashboard/console/controller/SubscriptionController.java
@@ -23,7 +23,6 @@
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -33,7 +32,9 @@
 @RequestMapping("/api/v1")
 public class SubscriptionController {
 
- @Autowired
+ /**
+ * TODO expose implement by FunctionManager
+ */
  SubscriptionCore subscriptionCore;
 
  // the subscription dataId naming pattern of EventMesh clients: ip-protocol

diff --git a/...sole/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java b/...sole/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -40,7 +39,9 @@
 @RequestMapping("/topic")
 public class TopicController {
 
- @Autowired
+ /**
+ * TODO expose implement by FunctionManager
+ */
  TopicCore topicCore;
 
  /**

diff --git a/...shboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java b/...shboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java
diff --git a/...shboard/core/meta/EtcdConnectionCore.java → ...e/meta/connection/EtcdConnectionCore.java b/...shboard/core/meta/EtcdConnectionCore.java → ...e/meta/connection/EtcdConnectionCore.java
@@ -15,16 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.meta;
+package org.apache.eventmesh.dashboard.core.meta.connection;
 
 import org.apache.eventmesh.dashboard.service.meta.ConnectionCore;
 
-import org.springframework.stereotype.Service;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Service
 public class EtcdConnectionCore implements ConnectionCore {
 
 }
diff --git a/...hboard/core/meta/NacosConnectionCore.java → .../meta/connection/NacosConnectionCore.java b/...hboard/core/meta/NacosConnectionCore.java → .../meta/connection/NacosConnectionCore.java
@@ -15,20 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.meta;
+package org.apache.eventmesh.dashboard.core.meta.connection;
 
-import org.apache.eventmesh.dashboard.core.config.AdminProperties;
 import org.apache.eventmesh.dashboard.service.meta.ConnectionCore;
 
-import org.springframework.stereotype.Service;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Service
 public class NacosConnectionCore implements ConnectionCore {
 
- public NacosConnectionCore(AdminProperties adminProperties) {
- }
-
 }
diff --git a/...board/core/meta/EtcdSubscriptionCore.java → ...ta/subscription/EtcdSubscriptionCore.java b/...board/core/meta/EtcdSubscriptionCore.java → ...ta/subscription/EtcdSubscriptionCore.java
@@ -15,20 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.meta;
+package org.apache.eventmesh.dashboard.core.meta.subscription;
 
 import org.apache.eventmesh.dashboard.common.dto.Result;
 import org.apache.eventmesh.dashboard.common.model.SubscriptionInfo;
 import org.apache.eventmesh.dashboard.service.meta.SubscriptionCore;
 
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Service
 public class EtcdSubscriptionCore implements SubscriptionCore {
 
  @Override

diff --git a/...oard/core/meta/NacosSubscriptionCore.java → ...a/subscription/NacosSubscriptionCore.java b/...oard/core/meta/NacosSubscriptionCore.java → ...a/subscription/NacosSubscriptionCore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.core.meta;
+package org.apache.eventmesh.dashboard.core.meta.subscription;
 
 import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_EMPTY_RESP_ERR;
 import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_GET_CONFIGS_ERR;
@@ -42,7 +42,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
@@ -57,7 +56,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Service
 public class NacosSubscriptionCore implements SubscriptionCore {
 
  AdminProperties adminProperties;
@@ -114,7 +112,7 @@ public String retrieveConfig(String dataId, String group) {
 
  /**
  * Retrieve a list of configs with Nacos OpenAPI, because Nacos SDK doesn't support listing and fuzzy matching.
- *
+ * <p>
  * TODO Granularity should be based on subscriptions rather than Runtime;
  * retrieve all subscriptions for each Runtime, rather than retrieving subscriptions for each individual Runtime.
  */