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

Changed structure to gather all metrics endpoints under one Controller

parent 03559a71

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -4,20 +4,18 @@ import io.swagger.v3.oas.annotations.Operation; 
import io.swagger.v3.oas.annotations.responses.ApiResponse;

import io.swagger.v3.oas.annotations.responses.ApiResponse;

import io.swagger.v3.oas.annotations.responses.ApiResponses;

import io.swagger.v3.oas.annotations.responses.ApiResponses;

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

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

import jakarta.validation.Valid;

import org.slf4j.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.slf4j.LoggerFactory;

import org.springframework.http.ResponseEntity;

import org.springframework.http.ResponseEntity;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;





import java.util.Map;

import java.util.Map;





@Tag(name = "GeneralMetricsApi")

@Tag(name = "MetricsApi")

public interface GeneralMetricsApi {

public interface MetricsApi {





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

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





    @Operation(summary = "Get total number of registered individuals", operationId = "getRegisteredIndividuals")

    @Operation(summary = "Get total number of registered individuals", operationId = "getRegisteredIndividuals")

    @ApiResponses(value = {

    @ApiResponses(value = {

src/main/java/org/etsi/osl/tmf/metrics/api/GerenalMetricsApiController.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.GeneralMetricsRepoService;

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

import org.slf4j.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Autowired;
@@ -12,14 +12,14 @@ import java.util.HashMap; 
import java.util.Map;

import java.util.Map;





@Controller

@Controller

public class GerenalMetricsApiController implements GeneralMetricsApi {

public class MetricsApiController implements MetricsApi {





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

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





    private final GeneralMetricsRepoService generalMetricsRepoService;

    private final MetricsRepoService generalMetricsRepoService;





    @Autowired

    @Autowired

    public GerenalMetricsApiController(GeneralMetricsRepoService generalMetricsRepoService) {

    public MetricsApiController(MetricsRepoService generalMetricsRepoService) {

        this.generalMetricsRepoService = generalMetricsRepoService;

        this.generalMetricsRepoService = generalMetricsRepoService;

    }

    }

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ package org.etsi.osl.tmf.metrics.reposervices; 
import org.etsi.osl.tmf.pm632.repo.IndividualRepository;

import org.etsi.osl.tmf.pm632.repo.IndividualRepository;

import org.etsi.osl.tmf.rcm634.repo.ResourceSpecificationRepository;

import org.etsi.osl.tmf.rcm634.repo.ResourceSpecificationRepository;

import org.etsi.osl.tmf.scm633.model.ServiceCandidate;

import org.etsi.osl.tmf.scm633.model.ServiceCandidate;

import org.etsi.osl.tmf.scm633.model.ServiceCategory;

import org.etsi.osl.tmf.scm633.repo.CandidateRepository;

import org.etsi.osl.tmf.scm633.repo.CandidateRepository;

import org.etsi.osl.tmf.scm633.repo.CategoriesRepository;

import org.etsi.osl.tmf.scm633.repo.CategoriesRepository;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +11,7 @@ import org.springframework.stereotype.Service; 
import java.util.List;

import java.util.List;





@Service

@Service

public class GeneralMetricsRepoService {

public class MetricsRepoService {





    @Autowired

    @Autowired

    IndividualRepository individualRepository;

    IndividualRepository individualRepository;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. 
//@TestPropertySource(

//@TestPropertySource(

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

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





public class GerenalMetricsApiControllerTest {

public class MetricsApiControllerTest {





    @Autowired

    @Autowired

    private MockMvc mvc;

    private MockMvc mvc;