Discovery server added

pom.xml

@@ -152,6 +152,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
 		<!-- 
 		<dependency>
 		    <groupId>org.jacoco</groupId> 

src/main/java/es/uv/saic/feign/CoreClient.java

@@ -26,7 +26,7 @@ import es.uv.saic.dto.ProcesDTO;
 import es.uv.saic.dto.TascaDTO;
 import es.uv.saic.dto.TascaInformeTransferDTO;
 
-@FeignClient(value = "core-service", url = "${saic.url.core.domain}/core")
+@FeignClient(name = "core-service")
 public interface CoreClient {
     //IndicadorController.java
     @GetMapping("/getFromTitulacio/{idTitulacio}/{curs}")
@@ -34,7 +34,7 @@ public interface CoreClient {
         throws ParserConfigurationException, MalformedURLException, IOException, SAXException;
 
    @PostMapping("/allInds")
-    public List<IndicadorEnquestaValorDTO> getAllInds2(@RequestBody IndicadorEnquestaDTO indicadorEnquestaDTO);
+    public List<IndicadorEnquestaValorDTOImp> getAllInds2(@RequestBody IndicadorEnquestaDTO indicadorEnquestaDTO);
 
     //TascaController.java
     @GetMapping("/instanciatasca/{id}")

src/main/java/es/uv/saic/service/PlantillaService.java

@@ -316,9 +316,7 @@ public class PlantillaService {
 		
 		/*  Indicadores de encuestas y otros almacenados en BD  */
 		IndicadorEnquestaDTO indicadorEnquestaDTO = new IndicadorEnquestaDTO(idTitulacio, idCentre, curs);
-		List<IndicadorEnquestaValorDTOImp> enquestesT = core.getAllInds2(indicadorEnquestaDTO).stream()
-															.map(ind -> (IndicadorEnquestaValorDTOImp) ind)
-															.toList();
+		List<IndicadorEnquestaValorDTOImp> enquestesT = core.getAllInds2(indicadorEnquestaDTO);
 				
 		for(IndicadorEnquestaValorDTOImp i : enquestesT) {
 			String indicador = i.getAmbit().toLowerCase().equals("t") ? (i.getEnquesta().toLowerCase()+"_"+i.getIndicador().toLowerCase()) : (i.getEnquesta().toLowerCase()+"_"+i.getIndicador().toLowerCase()+"_"+i.getAmbit().toLowerCase());

src/main/java/es/uv/saic/web/DocumentController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
 @RestController
-@RequestMapping("/docs")
 public class DocumentController {
     @Autowired
     private DocumentService ds;

src/main/java/es/uv/saic/web/DownloadController.java

@@ -56,7 +56,6 @@ import fr.opensagres.xdocreport.template.formatter.FieldsMetadata;
 
 
 @RestController
-@RequestMapping("/docs")
 public class DownloadController {
 
 	@Autowired 

src/main/java/es/uv/saic/web/PlantillaController.java

@@ -19,7 +19,6 @@ import es.uv.saic.service.PlantillaService;
 
 
 @RestController
-@RequestMapping("/docs")
 public class PlantillaController {
     @Autowired
     private PlantillaService ps;

src/main/resources/application-local.properties

@@ -1,8 +1,13 @@
-server.port = 8082
+server.port = 0
+spring.application.name = docs-service
+eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
+eureka.instance.prefer-ip-address=false
+eureka.instance.status-page-url-path=/
+
 # Urls
-saic.url.core.domain = http://127.0.0.1:8080
-saic.url.data.domain = http://127.0.0.1:8081
-saic.url.docs.domain = http://127.0.0.1:8082
+saic.url.core.domain = http://core-service
+saic.url.data.domain = http://data-service
+saic.url.docs.domain = http://docs-service
 saic.url.public = ${saic.url.docs.domain}/public
 
 # JPA Debug
@@ -40,10 +45,7 @@ logging.file.name=C:\\SAIC\\logs\\saic.log
 saic.scheduler.expired.enabled=false
 
 # Actuator
-spring.application.name = UV SAIC [LO]
 spring.boot.admin.client.url=http://127.0.0.1:9090
-spring.boot.admin.client.instance.management-base-url=${saic.url.docs.domain}
-spring.boot.admin.client.instance.service-url=${saic.url.docs.domain}
 spring.boot.admin.client.username=admin
 spring.boot.admin.client.password=kkdvk
 management.endpoints.web.exposure.include=*