1 files changed, 9 insertions, 23 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java b/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
index 7695e2435..c181c6f30 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,42 +21,28 @@
 package org.onap.vid.controller;
 
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
-import org.onap.vid.aai.AaiClient;
 import org.onap.vid.model.probes.ExternalComponentStatus;
-import org.onap.vid.mso.MsoBusinessLogic;
-import org.onap.vid.scheduler.SchedulerService;
-import org.onap.vid.services.VidService;
 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.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("probe")
 public class ProbeController extends RestrictedBaseController {
 
-    private final AaiClient aaiClient;
-    private final VidService vidService;
-    private final MsoBusinessLogic msoBusinessLogic;
-    private final SchedulerService schedulerService;
+    private final List<ProbeInterface> probes;
 
     @Autowired
-    public ProbeController(AaiClient aaiClient, VidService vidService, MsoBusinessLogic msoBusinessLogic, SchedulerService schedulerService) {
-        this.aaiClient = aaiClient;
-        this.vidService = vidService;
-        this.msoBusinessLogic = msoBusinessLogic;
-        this.schedulerService = schedulerService;
+    public ProbeController(List<ProbeInterface> probes) {
+        this.probes = probes;
     }
 
-    @RequestMapping(method= RequestMethod.GET)
+    @GetMapping
     public List<ExternalComponentStatus> getProbe() {
-        List<ExternalComponentStatus> componentStatuses = new ArrayList<>();
-        componentStatuses.add(aaiClient.probeAaiGetAllSubscribers());
-        componentStatuses.add(schedulerService.probeGetSchedulerChangeManagements());
-        return componentStatuses;
+        return probes.stream().map(ProbeInterface::probeComponent).collect(Collectors.toList());
     }
-
 }