Просмотр исходного кода

Arreglados deprecated relacionados con las fechas.

Mario Martínez Hernández 2 месяцев назад
Родитель
Сommit
92840a3974

+ 13 - 19
src/main/java/es/uv/saic/domain/Acreditacio.java

@@ -1,7 +1,7 @@
 package es.uv.saic.domain;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 @Entity
 @Table(name="acreditacions")
@@ -30,20 +28,16 @@ public class Acreditacio  implements Serializable {
 	private Integer cursImpla;
 	
 	@Column(name="data_verif")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataVerif;
+	private LocalDateTime dataVerif;
 	
 	@Column(name="data_renov")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataRenov;
+	private LocalDateTime dataRenov;
 	
 	@Column(name="data_acred")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataAcred;
+	private LocalDateTime dataAcred;
 	
 	@Column(name="data_segui")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataSegui;
+	private LocalDateTime dataSegui;
 	
 	private String grup;
 	
@@ -80,28 +74,28 @@ public class Acreditacio  implements Serializable {
 	public void setCursImpla(Integer cursImpla) {
 		this.cursImpla = cursImpla;
 	}
-	public Date getDataVerif() {
+	public LocalDateTime getDataVerif() {
 		return dataVerif;
 	}
-	public void setDataVerif(Date dataVerif) {
+	public void setDataVerif(LocalDateTime dataVerif) {
 		this.dataVerif = dataVerif;
 	}
-	public Date getDataRenov() {
+	public LocalDateTime getDataRenov() {
 		return dataRenov;
 	}
-	public void setDataRenov(Date dataRenov) {
+	public void setDataRenov(LocalDateTime dataRenov) {
 		this.dataRenov = dataRenov;
 	}
-	public Date getDataAcred() {
+	public LocalDateTime getDataAcred() {
 		return dataAcred;
 	}
-	public void setDataAcred(Date dataAcred) {
+	public void setDataAcred(LocalDateTime dataAcred) {
 		this.dataAcred = dataAcred;
 	}
-	public Date getDataSegui() {
+	public LocalDateTime getDataSegui() {
 		return dataSegui;
 	}
-	public void setDataSegui(Date dataSegui) {
+	public void setDataSegui(LocalDateTime dataSegui) {
 		this.dataSegui = dataSegui;
 	}
 	public String getGrup() {

+ 4 - 9
src/main/java/es/uv/saic/domain/IndicadorEnquesta.java

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 @Entity
 @Table(name="indicador_enquesta")
@@ -37,8 +35,7 @@ public class IndicadorEnquesta {
 	private String titulacioOrigen;
 	private Integer nenq;
 	private Integer ruct;
-	@Temporal(TemporalType.TIMESTAMP)
-	private Timestamp data;
+	private LocalDateTime data;
 	
 	public IndicadorEnquesta(){}
 	
@@ -178,11 +175,11 @@ public class IndicadorEnquesta {
 		this.ruct = ruct;
 	}
 
-	public Timestamp getData() {
+	public LocalDateTime getData() {
 		return data;
 	}
 
-	public void setData(Timestamp data) {
+	public void setData(LocalDateTime data) {
 		this.data = data;
 	}
 	
@@ -235,6 +232,4 @@ public class IndicadorEnquesta {
 		
 		return hash;
 	}
-
-		
 }

+ 5 - 8
src/main/java/es/uv/saic/domain/IndicadorEnquestaTmp.java

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 @Entity
 @Table(name="indicador_enquesta_tmp")
@@ -38,9 +36,8 @@ public class IndicadorEnquestaTmp {
 	private String titulacioOrigen;
 	private Integer nenq;
 	private Integer ruct;
-	
-	@Temporal(TemporalType.TIMESTAMP)
-	private Timestamp data; 
+
+	private LocalDateTime data; 
 	
 	public IndicadorEnquestaTmp(){}
 	
@@ -148,11 +145,11 @@ public class IndicadorEnquestaTmp {
 		this.usuari = usuari;
 	}
 
-	public Timestamp getData() {
+	public LocalDateTime getData() {
 		return data;
 	}
 
-	public void setData(Timestamp data) {
+	public void setData(LocalDateTime data) {
 		this.data = data;
 	}
 	

+ 14 - 8
src/main/java/es/uv/saic/domain/Instancia.java

@@ -2,12 +2,19 @@ package es.uv.saic.domain;
 
 import java.io.Serializable;
 import java.math.BigInteger;
-
-import jakarta.persistence.*;
-
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
 /**
  * The persistent class for the instancies database table.
  * 
@@ -28,9 +35,8 @@ public class Instancia implements Serializable {
 
 	private Integer titulacio;
 	
-	@Temporal(TemporalType.DATE)
 	@Column(name="data")
-	private Date data;
+	private LocalDate data;
 
 	//bi-directional many-to-one association to Organ
 	@ManyToOne
@@ -84,11 +90,11 @@ public class Instancia implements Serializable {
 		this.titulacio = titulacio;
 	}
 	
-	public Date getData() {
+	public LocalDate getData() {
 		return data;
 	}
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 	}
 

+ 11 - 13
src/main/java/es/uv/saic/domain/InstanciaTasca.java

@@ -2,9 +2,10 @@ package es.uv.saic.domain;
 
 import java.io.Serializable;
 import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 import jakarta.persistence.*;
-import java.util.Date;
 
 /**
  * The persistent class for the tasquesi database table.
@@ -20,17 +21,14 @@ public class InstanciaTasca implements Serializable {
 	@Column(name="id_tascai")
 	private BigInteger idInstanciaTasca;
 
-	@Temporal(TemporalType.DATE)
 	@Column(name="data_fet")
-	private Date dataFet;
+	private LocalDate dataFet;
 	
-	@Temporal(TemporalType.DATE)
 	@Column(name="data")
-	private Date data;
+	private LocalDate data;
 	
-	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="data_mod")
-	private Date dataMod;
+	private LocalDateTime dataMod;
 	
 	private Integer version;
 
@@ -66,27 +64,27 @@ public class InstanciaTasca implements Serializable {
 		this.idInstanciaTasca = idInstanciaTasca;
 	}
 
-	public Date getDataFet() {
+	public LocalDate getDataFet() {
 		return this.dataFet;
 	}
 
-	public void setDataFet(Date dataFet) {
+	public void setDataFet(LocalDate dataFet) {
 		this.dataFet = dataFet;
 	}
 	
-	public Date getData() {
+	public LocalDate getData() {
 		return this.data;
 	}
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 	}
 	
-	public Date getDataMod() {
+	public LocalDateTime getDataMod() {
 		return dataMod;
 	}
 
-	public void setDataMod(Date dataMod) {
+	public void setDataMod(LocalDateTime dataMod) {
 		this.dataMod = dataMod;
 	}
 

+ 5 - 6
src/main/java/es/uv/saic/domain/Tasca.java

@@ -1,9 +1,9 @@
 package es.uv.saic.domain;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 
 import jakarta.persistence.*;
-import java.util.Date;
 import java.util.List;
 
 
@@ -24,9 +24,8 @@ public class Tasca implements Serializable {
 	@Column(name="codi_evidencia")
 	private String codiEvidencia;
 
-	@Temporal(TemporalType.DATE)
 	@Column(name="data_lim")
-	private Date dataLim;
+	private LocalDate dataLim;
 
 	@Column(name="descripcio_cas")
 	private String descripcioCas;
@@ -99,11 +98,11 @@ public class Tasca implements Serializable {
 		this.codiEvidencia = codiEvidencia;
 	}
 
-	public Date getDataLim() {
+	public LocalDate getDataLim() {
 		return this.dataLim;
 	}
 
-	public void setDataLim(Date dataLim) {
+	public void setDataLim(LocalDate dataLim) {
 		this.dataLim = dataLim;
 	}
 
@@ -225,7 +224,7 @@ public class Tasca implements Serializable {
 	
 	public boolean isExpired() {
 		if(this.getDataLim() != null) {
-			if((new Date(this.getDataLim().getTime()+(1000 * 60 * 60 * 24))).before(new Date())) {
+			if(this.getDataLim().isBefore(LocalDate.now())) {
 				return true;
 			}
 			else {

+ 12 - 7
src/main/java/es/uv/saic/domain/Usuari.java

@@ -1,11 +1,17 @@
 package es.uv.saic.domain;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
 
 /**
  * The persistent class for the usuaris database table.
@@ -30,9 +36,8 @@ public class Usuari implements Serializable {
 
 	private String nom;
 	
-	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="data_ultim")
-	private Date dataUltim;
+	private LocalDateTime dataUltim;
 	
 	private String locale;
 
@@ -104,11 +109,11 @@ public class Usuari implements Serializable {
 		this.nom = nom;
 	}
 	
-	public Date getDataUltim() {
+	public LocalDateTime getDataUltim() {
 		return this.dataUltim;
 	}
 
-	public void setDataUltim(Date dataUltim) {
+	public void setDataUltim(LocalDateTime dataUltim) {
 		this.dataUltim = dataUltim;
 	}
 	

+ 16 - 11
src/main/java/es/uv/saic/domain/UsuarisRol.java

@@ -1,9 +1,16 @@
 package es.uv.saic.domain;
 
-
 import java.io.Serializable;
-import jakarta.persistence.*;
-import java.util.Date;
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  * The persistent class for the usuaris_rols database table.
@@ -19,11 +26,9 @@ public class UsuarisRol implements Serializable {
 	@Column(name="id_usuari_rol")
 	private Integer idUsuariRol;
 
-	@Temporal(TemporalType.DATE)
-	private Date fin;
+	private LocalDate fin;
 
-	@Temporal(TemporalType.DATE)
-	private Date inici;
+	private LocalDate inici;
 
 	private Integer num;
 
@@ -60,19 +65,19 @@ public class UsuarisRol implements Serializable {
 		this.idUsuariRol = idUsuariRol;
 	}
 
-	public Date getFin() {
+	public LocalDate getFin() {
 		return this.fin;
 	}
 
-	public void setFin(Date fin) {
+	public void setFin(LocalDate fin) {
 		this.fin = fin;
 	}
 
-	public Date getInici() {
+	public LocalDate getInici() {
 		return this.inici;
 	}
 
-	public void setInici(Date inici) {
+	public void setInici(LocalDate inici) {
 		this.inici = inici;
 	}
 

+ 0 - 2
src/main/java/es/uv/saic/dto/EmailDTO.java

@@ -1,7 +1,5 @@
 package es.uv.saic.dto;
 
-import es.uv.saic.domain.Usuari;
-
 public class EmailDTO {
     private String to;
     private String subject;

+ 2 - 2
src/main/java/es/uv/saic/service/AuthProvider.java

@@ -1,7 +1,7 @@
 package es.uv.saic.service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Hashtable;
 import java.util.List;
 
@@ -125,7 +125,7 @@ public class AuthProvider implements AuthenticationProvider {
                         throw new BadCredentialsException("Error de autenticación LDAP ["+username+"]: -> el servidor LDAP ha devuelto un estado incorrecto.");
                     }
                     logger.info("Autenticación LDAP correcta: " + u.getUsuari());
-                    u.setDataUltim(new Date(System.currentTimeMillis()));
+                    u.setDataUltim(LocalDateTime.now());
                     this.us.save(u);
 	            	if(u.isAdmin()) {
 	            		authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));

+ 5 - 6
src/main/java/es/uv/saic/service/DataService.java

@@ -8,7 +8,7 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -19,8 +19,6 @@ import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetProvider;
 
-import jakarta.mail.MessagingException;
-
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
@@ -29,13 +27,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 
+import es.uv.saic.domain.Datasource;
 import es.uv.saic.domain.IndicadorEnquestaTmp;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.EmailDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.OrganDTO;
 import es.uv.saic.feing.CoreClient;
-import es.uv.saic.domain.Datasource;
+import jakarta.mail.MessagingException;
 
 
 @Service
@@ -165,7 +164,7 @@ public class DataService {
 	        	ie.setCursd(cursd);
 	        	ie.setTipus(type);
 	        	ie.setUsuari(usuari);
-	        	ie.setData(new Timestamp(System.currentTimeMillis()));
+	        	ie.setData(LocalDateTime.now());
 	        	ie.setCursEnquesta(cursEnquesta);
 	        	ie.setTitulacioOrigen(titulacioOrigen);
 	        	ie.setCentreOrigen(centreOrigen);
@@ -311,7 +310,7 @@ public class DataService {
 						ie.setCursd(cursd);
 						ie.setTipus(tipus);
 						ie.setUsuari(usuari);
-						ie.setData(new Timestamp(System.currentTimeMillis()));
+						ie.setData(LocalDateTime.now());
 						ie.setCursEnquesta(cursEnquesta);
 						ie.setTitulacioOrigen(titulacioOrigen);
 						ie.setCentreOrigen(centreOrigen);