Commit 7fc6f2dd authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Changed structure to gather all metrics endpoints under one Controller

parent e66c7b40
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.time.OffsetDateTime;
import java.util.Map;

@Tag(name = "ServiceMetricsApi")
public interface ServiceMetricsApi {
@Tag(name = "MetricsApi")
public interface MetricsApi {

    Logger log = LoggerFactory.getLogger(ServiceMetricsApi.class);
    Logger log = LoggerFactory.getLogger(MetricsApi.class);

    @Operation(summary = "Get total number of services", operationId = "getTotalServices")
    @ApiResponses(value = {
+5 −5
Original line number Diff line number Diff line
package org.etsi.osl.tmf.metrics.api;

import org.etsi.osl.tmf.common.model.service.ServiceStateType;
import org.etsi.osl.tmf.metrics.reposervices.ServiceMetricsRepoService;
import org.etsi.osl.tmf.metrics.reposervices.MetricsRepoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,13 +16,13 @@ import java.util.List;
import java.util.Map;

@Controller
public class ServiceMetricsApiController implements ServiceMetricsApi{
public class MetricsApiController implements MetricsApi {

    private static final Logger log = LoggerFactory.getLogger(ServiceMetricsApiController.class);
    private final ServiceMetricsRepoService serviceMetricsRepoService;
    private static final Logger log = LoggerFactory.getLogger(MetricsApiController.class);
    private final MetricsRepoService serviceMetricsRepoService;

    @Autowired
    public ServiceMetricsApiController(ServiceMetricsRepoService serviceMetricsRepoService) {
    public MetricsApiController(MetricsRepoService serviceMetricsRepoService) {
        this.serviceMetricsRepoService = serviceMetricsRepoService;
    }

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ import java.util.Map;
import java.util.stream.Collectors;

@Service
public class ServiceMetricsRepoService {
public class MetricsRepoService {

    @Autowired
    ObjectMapper objectMapper;
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@ActiveProfiles("testing")
//@TestPropertySource(
//		  locations = "classpath:application-testing.yml")
public class ServiceMetricsApiControllerTest {
public class MetricsApiControllerTest {

    @Autowired
    private MockMvc mvc;