diff options
Diffstat (limited to 'vid-app-common/src/main')
15 files changed, 460 insertions, 54 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java index 3f914649d..5f69b8769 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java @@ -31,7 +31,7 @@ import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse; import org.onap.vid.aai.model.PortDetailsTranslator; import org.onap.vid.aai.model.Properties; import org.onap.vid.aai.model.ResourceType; -import org.onap.vid.controller.ProbeInterface; +import org.onap.vid.services.ProbeInterface; import org.onap.vid.model.SubscriberList; /** * Created by Oren on 7/4/17. diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java index 4cc95890d..d2c208ea7 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java @@ -23,7 +23,7 @@ package org.onap.vid.aai; import io.joshworks.restclient.http.HttpResponse; import org.onap.portalsdk.core.util.SystemProperties; import org.onap.vid.aai.model.ResourceType; -import org.onap.vid.controller.ProbeInterface; +import org.onap.vid.services.ProbeInterface; import org.onap.vid.model.SubscriberList; public interface AaiOverTLSClientInterface extends ProbeInterface { diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java b/vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java new file mode 100644 index 000000000..38a69faa8 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java @@ -0,0 +1,81 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.vid.controller; + +import org.jetbrains.annotations.NotNull; +import org.onap.portalsdk.core.controller.RestrictedBaseController; +import org.onap.portalsdk.core.controller.UnRestrictedBaseController; +import org.onap.vid.model.errorReport.ReportCreationParameters; +import org.onap.vid.reports.ReportGenerator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BinaryOperator; + +@RestController +public class ErrorReportController extends RestrictedBaseController { + + private final List<ReportGenerator> providers; + + @Autowired + public ErrorReportController(List<ReportGenerator> reportGenerators) { + providers = reportGenerators; + } + + @PostMapping(value = "error-report") + public Map<String, Object> getErrorReport(HttpServletRequest request, + @RequestBody ReportCreationParameters creationParameters) { + return generateReportsData(request, creationParameters); + } + + @NotNull + HashMap<String, Object> generateReportsData(HttpServletRequest request, ReportCreationParameters creationParameters) { + return providers + .stream() + .filter(provider -> provider.canGenerate(creationParameters)) + .map(provider -> provider.apply(request, creationParameters)) + .map(Map::entrySet) + .flatMap(Collection::parallelStream) + .reduce(new HashMap<>(), this::putAndGet, concatenateMap()); + } + + @NotNull + private HashMap<String, Object> putAndGet(HashMap<String, Object> map, Map.Entry<String, Object> entry) { + map.put(entry.getKey(), entry.getValue()); + return map; + } + + @NotNull + private BinaryOperator<HashMap<String, Object>> concatenateMap() { + return (map1, map2) -> { + map1.putAll(map2); + return map1; + }; + } + +}
\ No newline at end of file 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 c181c6f30..26a8add6a 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 @@ -22,27 +22,27 @@ package org.onap.vid.controller; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.onap.vid.model.probes.ExternalComponentStatus; +import org.onap.vid.services.ProbeService; 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.RestController; import java.util.List; -import java.util.stream.Collectors; @RestController @RequestMapping("probe") public class ProbeController extends RestrictedBaseController { - private final List<ProbeInterface> probes; + final private ProbeService probeService; @Autowired - public ProbeController(List<ProbeInterface> probes) { - this.probes = probes; + public ProbeController(ProbeService probeService) { + this.probeService = probeService; } @GetMapping public List<ExternalComponentStatus> getProbe() { - return probes.stream().map(ProbeInterface::probeComponent).collect(Collectors.toList()); + return probeService.getProbe(); } } diff --git a/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java b/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java index f7c56b7b6..a6419ef42 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.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. @@ -24,25 +24,34 @@ import java.util.Properties; public class GitRepositoryState { - private final String commitId; - private final String commitMessageShort; - private final String commitTime; + public static final GitRepositoryState EMPTY = new GitRepositoryState("", "", ""); - public GitRepositoryState(Properties properties) { - this.commitId = String.valueOf(properties.get("git.commit.id")); - this.commitMessageShort = String.valueOf(properties.get("git.commit.message.short")); - this.commitTime = String.valueOf(properties.get("git.commit.time")); - } + private final String commitId; + private final String commitMessageShort; + private final String commitTime; - public String getCommitId() { - return commitId; - } + public GitRepositoryState(Properties properties) { + this(String.valueOf(String.valueOf(properties.get("git.commit.id"))), + String.valueOf(properties.get("git.commit.message.short")), + String.valueOf(properties.get("git.commit.time")) + ); + } - public String getCommitMessageShort() { - return commitMessageShort; - } + private GitRepositoryState(String commitId, String commitMessageShort, String commitTime) { + this.commitId = commitId; + this.commitMessageShort = commitMessageShort; + this.commitTime = commitTime; + } - public String getCommitTime() { - return commitTime; - } + public String getCommitId() { + return commitId; + } + + public String getCommitMessageShort() { + return commitMessageShort; + } + + public String getCommitTime() { + return commitTime; + } } diff --git a/vid-app-common/src/main/java/org/onap/vid/model/Service.java b/vid-app-common/src/main/java/org/onap/vid/model/Service.java index bb6c92e89..016828381 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/Service.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/Service.java @@ -33,19 +33,19 @@ public class Service { /** The uuid. */ private String uuid; - + /** The invariant uuid. */ private String invariantUuid; - + /** The name. */ private String name; - + /** The version. */ private String version; - + /** The tosca model URL. */ private String toscaModelURL; - + /** The category. */ private String category; @@ -54,10 +54,10 @@ public class Service { /** The Service Role */ private String serviceRole; - + /** The description. */ private String description; - + /** The service ecomp naming flag */ private String serviceEcompNaming; @@ -77,7 +77,7 @@ public class Service { public String getUuid() { return uuid; } - + /** * Gets the invariant uuid. * @@ -86,7 +86,7 @@ public class Service { public String getInvariantUuid() { return invariantUuid; } - + /** * Gets the name. * @@ -95,7 +95,7 @@ public class Service { public String getName() { return name; } - + /** * Gets the version. * @@ -104,7 +104,7 @@ public class Service { public String getVersion() { return version; } - + /** * Gets the tosca model URL. * @@ -113,7 +113,7 @@ public class Service { public String getToscaModelURL() { return toscaModelURL; } - + /** * Gets the category. * @@ -122,7 +122,7 @@ public class Service { public String getCategory() { return category; } - + /** * Gets the description. * @@ -131,7 +131,7 @@ public class Service { public String getDescription() { return description; } - + /** * Gets the inputs. * @@ -161,7 +161,7 @@ public class Service { public void setUuid(String uuid) { this.uuid = uuid; } - + /** * Sets the invariant uuid. * @@ -170,7 +170,7 @@ public class Service { public void setInvariantUuid(String invariantUuid) { this.invariantUuid = invariantUuid; } - + /** * Sets the name. * @@ -179,7 +179,7 @@ public class Service { public void setName(String name) { this.name = name; } - + /** * Sets the version. * @@ -188,7 +188,7 @@ public class Service { public void setVersion(String version) { this.version = version; } - + /** * Sets the tosca model URL. * @@ -197,7 +197,7 @@ public class Service { public void setToscaModelURL(String toscaModelURL) { this.toscaModelURL = toscaModelURL; } - + /** * Sets the category. * @@ -206,7 +206,7 @@ public class Service { public void setCategory(String category) { this.category = category; } - + /** * Sets the description. * @@ -215,7 +215,7 @@ public class Service { public void setDescription(String description) { this.description = description; } - + /** * Sets the inputs. * @@ -239,7 +239,7 @@ public class Service { public int hashCode() { return UUID.fromString(getUuid()).hashCode(); } - + /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ @@ -247,9 +247,9 @@ public class Service { public boolean equals(Object o) { if (o == this) return true; if (!(o instanceof Service)) return false; - + final Service service = (Service) o; - + return (service.getUuid().equals(getUuid())); } diff --git a/vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java b/vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java new file mode 100644 index 000000000..babbf8906 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java @@ -0,0 +1,48 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.vid.model.errorReport; + +public class ReportCreationParameters { + private String requestId; + private String serviceUuid; + + public ReportCreationParameters() {} + + public ReportCreationParameters(String requestId, String serviceUuid) { + this.requestId = requestId; + this.serviceUuid = serviceUuid; + } + + public String getRequestId() { + return requestId; + } + + public String getServiceUuid() { + return serviceUuid; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public void setServiceUuid(String serviceUuid) { + this.serviceUuid = serviceUuid; + } +}
\ No newline at end of file diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java index ed64d2066..cc3231582 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java @@ -24,7 +24,7 @@ package org.onap.vid.mso; import org.onap.vid.changeManagement.RequestDetailsWrapper; import org.onap.vid.changeManagement.WorkflowRequestDetail; import org.onap.vid.controller.OperationalEnvironmentController; -import org.onap.vid.controller.ProbeInterface; +import org.onap.vid.services.ProbeInterface; import org.onap.vid.model.SOWorkflowList; import org.onap.vid.model.SoftDeleteRequest; import org.onap.vid.mso.model.OperationalEnvironmentActivateInfo; diff --git a/vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java b/vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java new file mode 100644 index 000000000..00f8077d3 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java @@ -0,0 +1,110 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.vid.reports; + +import com.google.common.collect.ImmutableMap; +import io.joshworks.restclient.http.HttpResponse; +import org.onap.vid.controller.ControllersUtils; +import org.onap.vid.model.GitRepositoryState; +import org.onap.vid.model.SubscriberList; +import org.onap.vid.model.errorReport.ReportCreationParameters; +import org.onap.vid.model.probes.ExternalComponentStatus; +import org.onap.vid.services.AaiService; +import org.onap.vid.services.ProbeService; +import org.onap.vid.utils.SystemPropertiesWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import static org.onap.portalsdk.core.util.SystemProperties.ECOMP_REQUEST_ID; + +@Component +public class BasicReportGenerator implements ReportGenerator { + + private static final String GIT_PROPERTIES_FILENAME = "git.properties"; + private final AaiService aaiService; + private final SystemPropertiesWrapper systemPropertiesWrapper; + private final ProbeService probeService; + + @Autowired + public BasicReportGenerator(AaiService aaiService, SystemPropertiesWrapper systemPropertiesWrapper, + ProbeService probeService) { + this.aaiService = aaiService; + this.systemPropertiesWrapper = systemPropertiesWrapper; + this.probeService = probeService; + } + + @Override + public Map<String, Object> apply(HttpServletRequest request, ReportCreationParameters creationParameters) { + return ImmutableMap.<String, Object>builder() + .put("X-ECOMP-RequestID", request.getHeader(ECOMP_REQUEST_ID)) + .put("aaiFullSubscriberList", getFullSubscriberList()) + .put("userID", getUserIDFromSystemProperties(request)) + .put("commitInfo", getCommitInfoFromGitProperties()) + .put("probeInfo", getProbe()) + .build(); + } + + @Override + public boolean canGenerate(ReportCreationParameters creationParameters) { + return true; + } + + private GitRepositoryState getCommitInfoFromGitProperties() { + GitRepositoryState gitRepositoryState; + try (InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream(GIT_PROPERTIES_FILENAME)) { + Properties properties = new Properties(); + properties.load(resourceAsStream); + gitRepositoryState = new GitRepositoryState(properties); + } catch (IOException e) { + gitRepositoryState = GitRepositoryState.EMPTY; + } + return gitRepositoryState; + } + + String getUserIDFromSystemProperties(HttpServletRequest request) { + return new ControllersUtils(systemPropertiesWrapper).extractUserId(request); + } + + List<ExternalComponentStatus> getProbe() { + return probeService.getProbe(); + } + + ImmutableMap<String, Object> getFullSubscriberList() { + ImmutableMap<String, Object> fullSubscriberList; + try { + HttpResponse<SubscriberList> fullSubscriberListResponse = aaiService.getFullSubscriberList(); + fullSubscriberList = ImmutableMap.<String, Object>builder() + .put("status", fullSubscriberListResponse.getStatus()) + .put("body", fullSubscriberListResponse.getBody()) + .put("headers", fullSubscriberListResponse.getHeaders()) + .build(); + } catch (Exception e) { + fullSubscriberList = ImmutableMap.of("exception", e.toString()); + } + return fullSubscriberList; + } +} diff --git a/vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java b/vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java new file mode 100644 index 000000000..da845266d --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java @@ -0,0 +1,85 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.vid.reports; + +import com.google.common.collect.ImmutableMap; +import org.onap.vid.asdc.AsdcCatalogException; +import org.onap.vid.model.errorReport.ReportCreationParameters; +import org.onap.vid.mso.MsoBusinessLogic; +import org.onap.vid.mso.MsoResponseWrapper; +import org.onap.vid.services.VidService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; + +@Service +public class DeploymentReportGenerator implements ReportGenerator { + + private final VidService vidService; + private final MsoBusinessLogic msoBusinessLogic; + + @Autowired + public DeploymentReportGenerator(VidService vidService, MsoBusinessLogic msoBusinessLogic) { + this.vidService = vidService; + this.msoBusinessLogic = msoBusinessLogic; + } + + @Override + public Map<String, Object> apply(HttpServletRequest request, ReportCreationParameters creationParameters) { + return ImmutableMap.<String, Object>builder() + .put("serviceInstanceInfo", getOrchestrationRequestFromMso(creationParameters.getRequestId())) + .put("serviceDetails", getServiceDetails(creationParameters.getServiceUuid())) + .build(); + } + + @Override + public boolean canGenerate(ReportCreationParameters creationParameters) { + return creationParameters.getRequestId() != null && creationParameters.getServiceUuid() != null; + } + + MsoResponseWrapper getOrchestrationRequestFromMso(String requestId) { + return msoBusinessLogic.getOrchestrationRequest(requestId); + } + + Map<String, Object> getServiceDetails(String serviceUuid) { + Map<String, Object> serviceDetails; + try { + org.onap.vid.model.Service serviceModel = vidService.getService(serviceUuid).getService(); + serviceDetails = ImmutableMap.of("details", serviceModel); + } catch (AsdcCatalogException | NullPointerException e) { + serviceDetails = generateServiceDetailsExceptionResponse(serviceUuid, e); + } + return serviceDetails; + } + + Map<String, Object> generateServiceDetailsExceptionResponse(String serviceUuid, Exception e) { + Map<String, Object> result = new HashMap<>(); + if (e.getClass() == NullPointerException.class) { + result.put("message", "Service details for given uuid were not found"); + } + result.put("exception", e.toString()); + result.put("serviceUuid", serviceUuid); + return result; + } +} diff --git a/vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java b/vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java new file mode 100644 index 000000000..ccc290115 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java @@ -0,0 +1,32 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.vid.reports; + +import org.onap.vid.model.errorReport.ReportCreationParameters; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; +import java.util.function.BiFunction; + +public interface ReportGenerator extends BiFunction<HttpServletRequest, ReportCreationParameters, Map<String, Object>>{ + + boolean canGenerate(ReportCreationParameters creationParameters); + +} diff --git a/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java b/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java index 643cd22af..c74321dec 100644 --- a/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java +++ b/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java @@ -20,7 +20,7 @@ package org.onap.vid.scheduler; -import org.onap.vid.controller.ProbeInterface; +import org.onap.vid.services.ProbeInterface; public interface SchedulerService extends ProbeInterface { } diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeInterface.java b/vid-app-common/src/main/java/org/onap/vid/services/ProbeInterface.java index 1b3265971..7fbc9883e 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeInterface.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/ProbeInterface.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.vid.controller; +package org.onap.vid.services; import org.onap.vid.model.probes.ExternalComponentStatus; diff --git a/vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java b/vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java new file mode 100644 index 000000000..b2062d535 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java @@ -0,0 +1,42 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved. + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.vid.services; + +import org.onap.vid.model.probes.ExternalComponentStatus; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ProbeService { + + private final List<ProbeInterface> probes; + + @Autowired + public ProbeService(List<ProbeInterface> probes) { + this.probes = probes; + } + + public List<ExternalComponentStatus> getProbe(){ + return probes.stream().map(ProbeInterface::probeComponent).collect(Collectors.toList()); + } +} diff --git a/vid-app-common/src/main/java/org/onap/vid/services/VidService.java b/vid-app-common/src/main/java/org/onap/vid/services/VidService.java index 18d8398a3..f7bc1f275 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/VidService.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/VidService.java @@ -22,7 +22,6 @@ package org.onap.vid.services; import org.onap.vid.asdc.AsdcCatalogException; -import org.onap.vid.controller.ProbeInterface; import org.onap.vid.model.ServiceModel; public interface VidService extends ProbeInterface { |