diff --git a/pom.xml b/pom.xml
index 200865f..5c2747d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,20 @@
mariadb-java-client
runtime
+
+
+ org.springframework.data
+ spring-data-mongodb
+ 4.0.1
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-mongodb
+ 3.0.2
+
+
+
org.springframework.boot
spring-boot-starter-test
diff --git a/src/main/java/es/fp/edu/conecta2/BDConfig.java b/src/main/java/es/fp/edu/conecta2/BDMariaDB.java
similarity index 99%
rename from src/main/java/es/fp/edu/conecta2/BDConfig.java
rename to src/main/java/es/fp/edu/conecta2/BDMariaDB.java
index f08f73e..43519ab 100644
--- a/src/main/java/es/fp/edu/conecta2/BDConfig.java
+++ b/src/main/java/es/fp/edu/conecta2/BDMariaDB.java
@@ -22,7 +22,7 @@ import java.util.Map;
entityManagerFactoryRef = "userEntityManagerFactory",
transactionManagerRef = "userTransactionManger",
basePackages = {"es.fp.edu.conecta2.repo.user"})
-public class BDConfig {
+public class BDMariaDB {
@Autowired
private Environment env;
@@ -63,8 +63,4 @@ public class BDConfig {
return transactionManager;
}
-
-
-
-
}
diff --git a/src/main/java/es/fp/edu/conecta2/Conecta2Application.java b/src/main/java/es/fp/edu/conecta2/Conecta2Application.java
index 55a1e29..e0280a3 100644
--- a/src/main/java/es/fp/edu/conecta2/Conecta2Application.java
+++ b/src/main/java/es/fp/edu/conecta2/Conecta2Application.java
@@ -1,13 +1,29 @@
package es.fp.edu.conecta2;
+import es.fp.edu.conecta2.modelo.user.User;
+import es.fp.edu.conecta2.repo.user.IUserRepo;
+import es.fp.edu.conecta2.servicios.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-public class Conecta2Application {
+public class Conecta2Application implements CommandLineRunner {
public static void main(String[] args) {
SpringApplication.run(Conecta2Application.class, args);
}
+ @Autowired
+ private UserService repositorioUser;
+
+ @Override
+ public void run(String... args) throws Exception {
+ User user1 = new User();
+ user1.setIdUsuario(1);
+ user1.setNombres("Juanjo");
+ //repositorioUser.registrar(user1);
+
+ }
}
diff --git a/src/main/java/es/fp/edu/conecta2/controladores/TestController.java b/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java
similarity index 93%
rename from src/main/java/es/fp/edu/conecta2/controladores/TestController.java
rename to src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java
index 3881eae..69df4a4 100644
--- a/src/main/java/es/fp/edu/conecta2/controladores/TestController.java
+++ b/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java
@@ -9,8 +9,8 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
@RestController
-@RequestMapping("/databases")
-public class TestController {
+@RequestMapping("/api")
+public class ApiControlador {
@Autowired
private AdminService adminService;
diff --git a/src/main/java/es/fp/edu/conecta2/controladores/Controlador01.java b/src/main/java/es/fp/edu/conecta2/controladores/Controlador01.java
deleted file mode 100644
index b1c502d..0000000
--- a/src/main/java/es/fp/edu/conecta2/controladores/Controlador01.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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/controladores/WebControlador.java b/src/main/java/es/fp/edu/conecta2/controladores/WebControlador.java
new file mode 100644
index 0000000..404049a
--- /dev/null
+++ b/src/main/java/es/fp/edu/conecta2/controladores/WebControlador.java
@@ -0,0 +1,26 @@
+package es.fp.edu.conecta2.controladores;
+
+import es.fp.edu.conecta2.repo.user.IUserRepo;
+import es.fp.edu.conecta2.servicios.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class WebControlador {
+
+ @GetMapping ("/")
+ public String prueba() {
+ return "Esto es una prueba";
+ }
+
+ @Autowired
+ private UserService servicioUser;
+ @GetMapping ("/user")
+ public String listarUser(Model modelo){
+ modelo.addAttribute("user",servicioUser.listarUser());
+ return "usuarios";
+ }
+
+}
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
index 3c1a34c..65025b8 100644
--- a/src/main/java/es/fp/edu/conecta2/modelo/user/User.java
+++ b/src/main/java/es/fp/edu/conecta2/modelo/user/User.java
@@ -8,6 +8,7 @@ import jakarta.persistence.Table;
@Entity
@Table(name="tbl_user")
public class User {
+
public Integer getIdUsuario() {
return idUsuario;
}
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
index d925657..e6d2f07 100644
--- a/src/main/java/es/fp/edu/conecta2/repo/admin/IAdminRepo.java
+++ b/src/main/java/es/fp/edu/conecta2/repo/admin/IAdminRepo.java
@@ -2,7 +2,9 @@ package es.fp.edu.conecta2.repo.admin;
import es.fp.edu.conecta2.modelo.admin.Admin;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+@Repository
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
index c27cc99..2110242 100644
--- a/src/main/java/es/fp/edu/conecta2/repo/user/IUserRepo.java
+++ b/src/main/java/es/fp/edu/conecta2/repo/user/IUserRepo.java
@@ -2,6 +2,8 @@ package es.fp.edu.conecta2.repo.user;
import es.fp.edu.conecta2.modelo.user.User;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+@Repository
public interface IUserRepo extends JpaRepository {
}
diff --git a/src/main/java/es/fp/edu/conecta2/servicios/UserService.java b/src/main/java/es/fp/edu/conecta2/servicios/UserService.java
index 38f2a91..571c0c6 100644
--- a/src/main/java/es/fp/edu/conecta2/servicios/UserService.java
+++ b/src/main/java/es/fp/edu/conecta2/servicios/UserService.java
@@ -5,6 +5,8 @@ import es.fp.edu.conecta2.repo.user.IUserRepo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
public class UserService {
@Autowired
@@ -13,5 +15,10 @@ public class UserService {
public void registrar(User t){
repo.save(t);
}
+
+ public List listarUser(){
+ return repo.findAll();
+ }
+
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e723bee..76653f6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -22,11 +22,34 @@ persistente.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialec
persistente.jpa.database-platform=org.hibernate.dialect.MariaDBDialect
#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.sql.init.platform=mariadb
+persistente.datasource.data=data.sql
+persistente.jpa.defer-datasource-initialization=true
+persistente.sql.init.mode=always
-temporal.datasource.url=jdbc:h2:mem:temporal
+temporal.datasource.url=jdbc:h2:mem:test
+temporal.h2.console.enabled=true
+temporal.h2.console.settings.trace=false
+temporal.h2.console.settings.web-allow-others=false
temporal.datasource.username=sa
temporal.datasource.password=
temporal.datasource.driver-class-name=org.h2.Driver
temporal.jpa.show-sql=true
-temporal.jpa.hibernate.ddl-auto=create-drop
-temporal.jpa.database-platform=org.hibernate.dialect.H2Dialect
\ No newline at end of file
+temporal.jpa.hibernate.ddl-auto=update
+temporal.jpa.database-platform=org.hibernate.dialect.H2Dialect
+
+redis.redis.port=9323
+redis.redis.database=0
+redis.redis.host=localhost
+redis.redis.password=mypass
+redis.redis.timeout=60000
+
+mongo.data.mongodb.authentication-database=admin
+mongo.data.mongodb.username=root
+mongo.data.mongodb.password=root
+mongo.data.mongodb.database=test_db
+mongo.data.mongodb.port=27017
+mongo.data.mongodb.host=localhost
+
+
+
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
new file mode 100644
index 0000000..537b40f
--- /dev/null
+++ b/src/main/resources/data.sql
@@ -0,0 +1 @@
+insert into bolsa.tbl_user values (1,"Juan"), (2,"Perico"), (3,"Andrés");