Update en el mapping y eliminadas algunas dependencias

.vscode/settings.json

@@ -11,7 +11,7 @@
             "password": "acd425"
         }
     ],
-    "java.configuration.updateBuildConfiguration": "interactive",
+    "java.configuration.updateBuildConfiguration": "automatic",
     "java.compile.nullAnalysis.mode": "automatic",
     "java.dependency.syncWithFolderExplorer": false
 }

pom.xml

@@ -56,23 +56,11 @@
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-properties-migrator</artifactId>
 		    <scope>runtime</scope>
 		</dependency>
 		<dependency>
-		    <groupId>nz.net.ultraq.thymeleaf</groupId>
-		    <artifactId>thymeleaf-layout-dialect</artifactId>
-		</dependency>
-		<dependency>
-		    <groupId>org.thymeleaf.extras</groupId>
-		    <artifactId>thymeleaf-extras-springsecurity6</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>

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

@@ -50,13 +50,13 @@ public interface CoreClient {
     TascaDTO getByProcesTascap(@PathVariable Integer idProces, @PathVariable Integer idTascap);
 
     //OrganController.java
-    @GetMapping("/getTitulacionsByCentreTambit/{centre}/{tambit}")
+    @GetMapping("/organs/titulacions/{centre}/{tambit}")
     List<OrganDTO> getTitulacionsByCentreTambit(@PathVariable("centre") Integer lugar, @PathVariable("tambit") String tambit);
 
-    @GetMapping("/findById/{tlugar}/{idTitulacio}")
+    @GetMapping("/organs/find/{tlugar}/{idTitulacio}")
     OrganDTO findOrganById(@PathVariable("tlugar") String tlugar,  @PathVariable("idTitulacio") Integer idTitulacio);
 
-    @GetMapping("/getTitulacionsByTypeCentre/{lugar}/{ambit}")
+    @GetMapping("/organs/titulacions/type/{lugar}/{ambit}")
     List<OrganDTO> getTitulacionsByTypeCentre(@PathVariable Integer lugar, @PathVariable Integer ambit);
 
     //ProcesController.java

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

@@ -17,13 +17,14 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
 @RestController
+@RequestMapping("/documents")
 public class DocumentController {
     @Autowired
     private DocumentService ds;
     /*
      * endpoint para save
      */
-    @PostMapping("/document/save")
+    @PostMapping("/save")
     public Document save(@RequestBody Document doc) {
         return ds.save(doc); 
     }
@@ -31,7 +32,7 @@ public class DocumentController {
     /*
      * endpoing para findByCategoriaOrgan
      */
-    @PostMapping("/findByCategoriaOrgan")
+    @PostMapping("/categoria/organ")
     public Document findByCategoriaOrgan(@RequestBody CategoriaDTO categoria) {
         return ds.findByCategoriaOrgan(categoria.getCategoria(), categoria.getLugar(), categoria.getTlugar());
     }
@@ -39,7 +40,7 @@ public class DocumentController {
     /*
      * endpoint para findByID
      */
-    @GetMapping("/document/{idDocument}")
+    @GetMapping("/{idDocument}")
     public Document findByID(@PathVariable Integer idDocument) {
        return ds.findById(idDocument);
     }
@@ -48,18 +49,18 @@ public class DocumentController {
     /*
      * endpoint para upload
      */
-    @PostMapping("/document/upload")
+    @PostMapping("/upload")
     public String upload(@RequestBody DocumentTmpDTO documentTmpDTO) throws IOException {
         return ds.upload(documentTmpDTO.getIdDocument(), documentTmpDTO.getIdCategoria(),
             documentTmpDTO.getLugar(), documentTmpDTO.getTlugar(), documentTmpDTO.getFile());
     }
 
-    @PostMapping("/document/archive")
+    @PostMapping("/archive")
     public Document archive(@RequestBody Document doc) {
         return ds.archive(doc);
     }
 
-    @PostMapping("/archiveByOrgan")
+    @PostMapping("/archive/organ")
     public void archiveByOrgan(@RequestBody ArchiveOrganDTO organ) {
         ds.archiveByOrgan(organ.getLugar(), organ.getTlugar());
     }

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

@@ -89,7 +89,7 @@ public class DownloadController {
 	 * @param response HttpServletResponse
 	 * @return A FileSystemResource representing the file to download
 	 */
-	@GetMapping(value="/download/{fileName}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+	@GetMapping(value="/downloads/{fileName}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
 	public ResponseEntity<byte[]> download(@PathVariable("fileName") BigInteger idInstanciaTasca, HttpServletResponse response) throws FileNotFoundException {		
 		
 		try {
@@ -126,7 +126,7 @@ public class DownloadController {
 	 * @param response HttpServletResponse
 	 * @return A FileSystemResource representing the document to download
 	 */
-	@GetMapping(value="/download/document/{id}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+	@GetMapping(value="/downloads/document/{id}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
 	@ResponseBody
 	public ResponseEntity<byte[]> downloadDocument(@PathVariable("id") Integer idDocument, HttpServletResponse response) throws FileNotFoundException {		
 		Document document = ds.findById(idDocument);
@@ -153,7 +153,7 @@ public class DownloadController {
 	 * @param response HttpServletResponse
 	 * @return A FileSystemResource representing the report to download
 	 */
-	@GetMapping(value="/download/report/{t}/{p}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+	@GetMapping(value="/downloads/report/{t}/{p}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
 	@ResponseBody 
 	public ResponseEntity<byte[]> downloadReport(@PathVariable("t") Integer idTitulacio, @PathVariable("p") String nomProces,
 			HttpServletResponse response) throws IOException, XDocReportException {
@@ -183,7 +183,7 @@ public class DownloadController {
 	 * @param response HttpServletResponse
 	 * @return A byte array representing the populated template to download
 	 */
-	@GetMapping(value="/download/template/{id}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+	@GetMapping(value="/downloads/template/{id}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
 	@ResponseBody 
 	public ResponseEntity<byte[]> downloadTemplate(@PathVariable("id") BigInteger idTascai, HttpServletResponse response) throws IOException, XDocReportException {
 		XDocReportRegistry.getRegistry().clear();
@@ -526,7 +526,7 @@ public class DownloadController {
 	 * @param response HttpServletResponse
 	 * @return A byte array representing the generated PDF
 	 */
-	@GetMapping(value="/pdf/download/{idTascai}")
+	@GetMapping(value="/pdf/{idTascai}")
 	@ResponseBody
 	public byte[] downloadTemplatePdf(@PathVariable("idTascai") BigInteger idTascai, HttpServletResponse response) throws IOException, InterruptedException {
 		InstanciaTascaDTO it = core.findInstanciaTascaById(idTascai);

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

@@ -23,17 +23,17 @@ public class PlantillaController {
     @Autowired
     private PlantillaService ps;
 
-    @GetMapping("/plantilla")
+    @GetMapping("/plantillas")
     public List<Plantilla> findAll() {
         return ps.findAll();
     }
 
-    @GetMapping("/plantilla/{id}")
+    @GetMapping("/plantillas/{id}")
     public Plantilla findByID(@PathVariable Integer id) {
         return ps.findByID(id);
     }
     
-    @GetMapping("/plantilla/{versio}/{codi}/{ambit}")
+    @GetMapping("/plantillas/{versio}/{codi}/{ambit}")
     public Plantilla findByVersioCodiAmbit(@PathVariable Integer versio,
         @PathVariable String codi,
         @PathVariable String ambit) {
@@ -47,7 +47,7 @@ public class PlantillaController {
         }
     }
 
-    @PostMapping("/plantilla/save")
+    @PostMapping("/plantillas")
     public String save(@RequestBody Plantilla plantilla) {
         try {
             ps.save(plantilla);
@@ -58,28 +58,28 @@ public class PlantillaController {
         }
     }
     
-    @DeleteMapping("/plantilla/delete")
+    @DeleteMapping("/plantillas")
     public String delete(@RequestBody Plantilla plantilla) {
         ps.delete(plantilla);
         return "Delete";
     }
     
-    @GetMapping("/plantilla/used/{id}")
+    @GetMapping("/plantillas/used/{id}")
     public boolean isUsed(@PathVariable Integer id) {
        return ps.isUsed(id);
     }
 
-    @PostMapping("/addTemplateData")
+    @PostMapping("/plantillas/addTemplateData")
     public String addTemplateData(@RequestBody TemplateDataDTO td) {
         return ps.addTemplateData(td.getInstanciaTasca(), td.getTemplate());
     }
     
-    @PostMapping("/addTemplateData2")
+    @PostMapping("/plantillas/addTemplateData2")
     public String addTemplateData2(@RequestBody TemplateDataDTO td) {
         return ps.addTemplateData(td.getIdTitulacio(), td.getIdCentre(), td.getCurs(), td.getTemplate());        
 }
 
-    @PostMapping("/savePDF")
+    @PostMapping("/plantillas/savePDF")
     public String savePDF(@RequestBody PdfDTO pdf) throws IOException, InterruptedException {
         return ps.savePDF(pdf.getContent(), pdf.getIdtasca());        
 

src/main/resources/application-local.properties

@@ -2,16 +2,6 @@
 saic.url.domain = http://127.0.0.1
 saic.url.public = ${saic.url.docs.domain}/public
 
-# JPA Debug
-#spring.jpa.show-sql=true 
-#spring.jackson.serialization.FAIL_ON_SELF_REFERENCES=false
-
-# Email config
-saic.mailer.queue.enabled = false
-saic.mailer.reminder.enabled = false
-saic.mailer.calendar.enabled = false
-saic.mailer.maxMailsPerRound = 20
-
 # Data parser config
 saic.parser.surveys.path = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/databases/
 saic.parser.surveys.enabled = false

src/main/resources/application.properties

@@ -16,17 +16,12 @@ spring.profiles.active=@activatedProperties@
 # Multilang config
 spring.messages.encoding=UTF-8
 
-# Templates config
-spring.thymeleaf.mode=HTML
-spring.thymeleaf.encoding=UTF-8
-
 # JPA config
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 spring.jpa.hibernate.ddl-auto=none
 #spring.jpa.properties.hibernate.show_sql=true
 
-
 # Logs config
 logging.logback.rollingpolicy.max-file-size=10MB
 logging.level.root=INFO
@@ -40,16 +35,6 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.username=postgres
 spring.sql.init.platform=postgres
 
-#spring.jpa.show-sql=true 
-
-# Email config
-spring.main.banner-mode=off
-spring.mail.protocol=smtp
-spring.mail.host=post.uv.es
-spring.mail.port=25
-spring.mail.properties.mail.smtp.auth = false
-spring.mail.properties.mail.smtp.starttls.enable = false
-
 # Server
 server.port=0
 server.forward-headers-strategy=native