Commit 91af6a7d authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Changed structure to gather all metrics endpoints under one Controller

parent 8eb6ba5c

src/main/java/org/etsi/osl/tmf/metrics/api/ServiceOrderMetricsApi.java→src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApi.java

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; 
import io.swagger.v3.oas.annotations.responses.ApiResponses;

import io.swagger.v3.oas.annotations.tags.Tag;

import jakarta.validation.Valid;

import org.etsi.osl.tmf.common.model.service.ServiceStateType;

import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -18,10 +17,10 @@ import org.springframework.web.bind.annotation.RequestParam; 
import java.time.OffsetDateTime;

import java.util.Map;



@Tag(name = "ServiceOrderMetricsApi")

public interface ServiceOrderMetricsApi {

@Tag(name = "MetricsApi")

public interface MetricsApi {



    Logger log = LoggerFactory.getLogger(ServiceOrderMetricsApi.class);

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



    @Operation(summary = "Get total number of service orders", operationId = "getTotalServiceOrders")

    @ApiResponses(value = {

src/main/java/org/etsi/osl/tmf/metrics/api/ServiceOrderMetricsApiController.java→src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApiController.java

+5 −5
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.metrics.api;



import org.etsi.osl.tmf.metrics.reposervices.ServiceOrderMetricsRepoService;

import org.etsi.osl.tmf.metrics.reposervices.MetricsRepoService;

import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -18,13 +18,13 @@ import java.util.Map; 




@Controller

public class ServiceOrderMetricsApiController implements ServiceOrderMetricsApi{

public class MetricsApiController implements MetricsApi {



    private static final Logger log = LoggerFactory.getLogger(ServiceOrderMetricsApiController.class);

    private final ServiceOrderMetricsRepoService serviceOrderMetricsRepoService;

    private static final Logger log = LoggerFactory.getLogger(MetricsApiController.class);

    private final MetricsRepoService serviceOrderMetricsRepoService;



    @Autowired

    public ServiceOrderMetricsApiController(ServiceOrderMetricsRepoService serviceOrderMetricsRepoService) {

    public MetricsApiController(MetricsRepoService serviceOrderMetricsRepoService) {

        this.serviceOrderMetricsRepoService = serviceOrderMetricsRepoService;

    }

src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java→src/main/java/org/etsi/osl/tmf/metrics/reposervices/MetricsRepoService.java

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



@Service

public class ServiceOrderMetricsRepoService {

public class MetricsRepoService {



    @Autowired

    ObjectMapper objectMapper;

src/test/java/org/etsi/osl/services/api/metrics/ServiceOrderMetricsApiControllerTest.java→src/test/java/org/etsi/osl/services/api/metrics/MetricsApiControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
@ActiveProfiles("testing")

//@TestPropertySource(

//		  locations = "classpath:application-testing.yml")

public class ServiceOrderMetricsApiControllerTest {

public class MetricsApiControllerTest {



    @Autowired

    private MockMvc mvc;