diff --git a/src/main/java/es/fp/edu/conecta2/BDConfig.java b/src/main/java/es/fp/edu/conecta2/BDConfig.java new file mode 100644 index 0000000..8ac3610 --- /dev/null +++ b/src/main/java/es/fp/edu/conecta2/BDConfig.java @@ -0,0 +1,41 @@ +package es.fp.edu.conecta2; + +import org.springframework.core.env.Environment; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.sql.DataSource; + +@Configuration +@EnableTransactionManagement +@EnableJpaRepositories ( + entityManagerFactoryRef = "userEntityManagerFactory", + transactionManagerRef = "userTransactionManger", + basePackages = {"es.fp.edu.conecta2.repo.user"}) +public class BDConfig { + @Autowired + private Environment env; + + @Bean(name="userDataSource") + public DataSource userDatasource() { + DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setUrl(env.getProperty("persistente.datasource.url")); + dataSource.setUsername(env.getProperty("persistente.datasource.username")); + dataSource.setPassword(env.getProperty("persistente.datasource.password")); + dataSource.setDriverClassName(env.getProperty("persistente.datasource.driver-class-name")); + + return dataSource; + + } + @Bean(name="userEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean entityManagerFactory(){ + // TODO: 27/01/2023 + } + + +} diff --git a/src/main/java/es/fp/edu/conecta2/controladores/Controlador01.java b/src/main/java/es/fp/edu/conecta2/controladores/Controlador01.java new file mode 100644 index 0000000..ed4be3e --- /dev/null +++ b/src/main/java/es/fp/edu/conecta2/controladores/Controlador01.java @@ -0,0 +1,12 @@ +package es.fp.edu.conecta2.controladores; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class Controlador01 { + @GetMapping ("/") + public String prueba() { + return "Esto es una prueba"; + } +} diff --git a/src/main/java/es/fp/edu/conecta2/modelo/admin/Admin.java b/src/main/java/es/fp/edu/conecta2/modelo/admin/Admin.java new file mode 100644 index 0000000..782e512 --- /dev/null +++ b/src/main/java/es/fp/edu/conecta2/modelo/admin/Admin.java @@ -0,0 +1,33 @@ +package es.fp.edu.conecta2.modelo.admin; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name ="tbl_admin") +public class Admin { + public Integer getIdAdmin() { + return idAdmin; + } + + public void setIdAdmin(Integer idAdmin) { + this.idAdmin = idAdmin; + } + + public String getNombres() { + return nombres; + } + + public void setNombres(String nombres) { + this.nombres = nombres; + } + + @Id + private Integer idAdmin; + + @Column(name="nombres") + private String nombres; + +} diff --git a/src/main/java/es/fp/edu/conecta2/modelo/user/User.java b/src/main/java/es/fp/edu/conecta2/modelo/user/User.java new file mode 100644 index 0000000..3c1a34c --- /dev/null +++ b/src/main/java/es/fp/edu/conecta2/modelo/user/User.java @@ -0,0 +1,31 @@ +package es.fp.edu.conecta2.modelo.user; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name="tbl_user") +public class User { + public Integer getIdUsuario() { + return idUsuario; + } + + public void setIdUsuario(Integer idUsuario) { + this.idUsuario = idUsuario; + } + + public String getNombres() { + return nombres; + } + + public void setNombres(String nombres) { + this.nombres = nombres; + } + + @Id + private Integer idUsuario; + @Column(name="nombres") + private String nombres; +} diff --git a/src/main/java/es/fp/edu/conecta2/repo/admin/IAdminRepo.java b/src/main/java/es/fp/edu/conecta2/repo/admin/IAdminRepo.java new file mode 100644 index 0000000..b4f609f --- /dev/null +++ b/src/main/java/es/fp/edu/conecta2/repo/admin/IAdminRepo.java @@ -0,0 +1,8 @@ +package es.fp.edu.conecta2.repo.admin; + +import es.fp.edu.conecta2.modelo.admin.Admin; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IAdminRepo extends JpaRepository { + +} diff --git a/src/main/java/es/fp/edu/conecta2/repo/user/IUserRepo.java b/src/main/java/es/fp/edu/conecta2/repo/user/IUserRepo.java new file mode 100644 index 0000000..c27cc99 --- /dev/null +++ b/src/main/java/es/fp/edu/conecta2/repo/user/IUserRepo.java @@ -0,0 +1,7 @@ +package es.fp.edu.conecta2.repo.user; + +import es.fp.edu.conecta2.modelo.user.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IUserRepo extends JpaRepository { +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b575a90..084a6f1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,8 +18,8 @@ persistente.datasource.validationQuery=SELECT 1 persistente.jpa.hibernate.ddl-auto=validate persistente.jpa.show-sql=true persistente.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB103Dialect -persistente.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl -persistente.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy +#persistente.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl +#persistente.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy temporal.datasource.url=jdbc:h2:file:/home/public/h2 temporal.datasource.username=sa