Преглед изворни кода

Migrated to Spring 4.0.2 and Java 21

Drowsito пре 2 месеци
родитељ
комит
d9ca11411c

+ 3 - 3
pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.0</version>
+		<version>4.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>es.uv.saic</groupId>
@@ -15,9 +15,9 @@
 	<description>saic</description>
 
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-cloud.version>2023.0.3</spring-cloud.version>
+		<spring-cloud.version>2025.1.0</spring-cloud.version>
 	</properties>
 
 	<dependencyManagement>

+ 0 - 9
src/main/java/es/uv/saic/config/ApplicationLocaleResolver.java

@@ -43,13 +43,4 @@ public class ApplicationLocaleResolver extends SessionLocaleResolver {
 	        us.save(usuari);
         }        
     }
-    
-    @Override
-    protected Locale determineDefaultLocale(HttpServletRequest request) {
-    	if (this.getDefaultLocale() == null) {
-    		Locale locale = this.resolveLocale(request);
-    		this.setDefaultLocale(locale);
-    	}
-    	return this.getDefaultLocale();
-    }
 }

+ 2 - 2
src/main/java/es/uv/saic/config/WebConfig.java

@@ -1,7 +1,7 @@
 package es.uv.saic.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.servlet.ConditionalOnMissingFilterBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,7 +35,7 @@ public class WebConfig implements WebMvcConfigurer{
 	}
 	
 	@Bean
-	@ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class)
+	@ConditionalOnMissingBean(ForwardedHeaderFilter.class)
 	@ConditionalOnProperty(value = "server.forward-headers-strategy", havingValue = "native")
 	public FilterRegistrationBean<ForwardedHeaderFilter> forwardedHeaderFilter() {
 	    ForwardedHeaderFilter filter = new ForwardedHeaderFilter();

+ 0 - 11
src/main/resources/application-dev.properties

@@ -31,14 +31,3 @@ saic.data.evdocente = /DATA/saic-data/databases/ev_docente/latest/
 
 # Scheduler
 saic.scheduler.expired.enabled=false
-
-# Actuator
-spring.application.name = UV SAIC [TE]
-spring.boot.admin.client.url=http://garcosda.uv.es:9090
-spring.boot.admin.client.instance.management-base-url=${saic.url.domain}
-spring.boot.admin.client.instance.service-url=${saic.url.domain}
-spring.boot.admin.client.username=admin
-spring.boot.admin.client.password=kkdvk
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-saic.actuator.validIp=147.156.85.28

+ 0 - 11
src/main/resources/application-prod.properties

@@ -32,14 +32,3 @@ saic.data.evdocente = /DATA/saic-data/databases/ev_docente/latest/
 # Scheduler
 saic.scheduler.expired.enabled=false
 
-# Actuator
-spring.application.name = UV SAIC [PR]
-spring.boot.admin.client.url=http://garcosda.uv.es:9090
-spring.boot.admin.client.instance.management-base-url=${saic.url.domain}
-spring.boot.admin.client.instance.service-url=${saic.url.domain}
-spring.boot.admin.client.username=admin
-spring.boot.admin.client.password=kkdvk
-management.endpoints.web.exposure.include=*
-management.endpoint.health.show-details=always
-saic.actuator.validIp=147.156.85.28
-

+ 4 - 0
src/main/resources/application.properties

@@ -4,6 +4,10 @@ spring.application.name = saic-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=/
+# Desactivar RefreshScope en Eureka Client
+eureka.client.refresh.enable=false
+# Desactivar RefreshScope en SpringCloud
+spring.cloud.refresh.enabled=false
 
 # Actuator
 management.endpoints.web.exposure.include=*