Commit b4e7250e authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Changed structure to gather all metrics endpoints under one controller

parent 47ee8a05

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

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

import java.time.OffsetDateTime;

import java.util.Map;

import java.util.Map;





@Tag(name = "ResourceMetricsApi")

@Tag(name = "MetricsApi")

public interface ResourceMetricsApi {

public interface MetricsApi {





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

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





    @Operation(summary = "Get total number of resources", operationId = "getTotalResources")

    @Operation(summary = "Get total number of resources", operationId = "getTotalResources")

    @ApiResponses(value = {

    @ApiResponses(value = {

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

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

package org.etsi.osl.tmf.metrics.api;





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

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

import org.etsi.osl.tmf.ri639.model.ResourceStatusType;

import org.etsi.osl.tmf.ri639.model.ResourceStatusType;

import org.slf4j.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import java.util.Map;





@Controller

@Controller

public class ResourceMetricsApiController implements ResourceMetricsApi{

public class MetricsApiController implements MetricsApi {





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

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

    private final ResourceMetricsRepoService resourceMetricsRepoService;

    private final MetricsRepoService resourceMetricsRepoService;





    @Autowired

    @Autowired

    public ResourceMetricsApiController(ResourceMetricsRepoService resourceMetricsRepoService) {

    public MetricsApiController(MetricsRepoService resourceMetricsRepoService) {

        this.resourceMetricsRepoService = resourceMetricsRepoService;

        this.resourceMetricsRepoService = resourceMetricsRepoService;

    }

    }

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

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








@Service

@Service

public class ResourceMetricsRepoService {

public class MetricsRepoService {





    @Autowired

    @Autowired

    ObjectMapper objectMapper;

    ObjectMapper objectMapper;

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -5,10 +5,7 @@ import org.apache.commons.io.IOUtils; 
import org.etsi.osl.tmf.JsonUtils;

import org.etsi.osl.tmf.JsonUtils;

import org.etsi.osl.tmf.OpenAPISpringBoot;

import org.etsi.osl.tmf.OpenAPISpringBoot;

import org.etsi.osl.tmf.common.model.Any;

import org.etsi.osl.tmf.common.model.Any;

import org.etsi.osl.tmf.common.model.UserPartRoleType;

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

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

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

import org.etsi.osl.tmf.prm669.model.RelatedParty;

import org.etsi.osl.tmf.rcm634.model.*;

import org.etsi.osl.tmf.rcm634.model.*;

import org.etsi.osl.tmf.ri639.model.*;

import org.etsi.osl.tmf.ri639.model.*;

import org.etsi.osl.tmf.ri639.reposervices.ResourceRepoService;

import org.etsi.osl.tmf.ri639.reposervices.ResourceRepoService;
@@ -56,7 +53,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
@ActiveProfiles("testing")

@ActiveProfiles("testing")

//@TestPropertySource(

//@TestPropertySource(

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

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

public class ResourceMetricsApiControllerTest {

public class MetricsApiControllerTest {





    @Autowired

    @Autowired

    private MockMvc mvc;

    private MockMvc mvc;