diff --git a/.gitignore b/.gitignore index f94d402..fd3425a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ nbbuild/ dist/ nbdist/ .nb-gradle/ +/nbproject/ diff --git a/pom.xml b/pom.xml index 223bf9c..11e78ba 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,20 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.therealdanvega - jsontodb - 0.0.1-SNAPSHOT - jar - - jsontodb - Reading JSON and writing to a DB - - + org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.4.1 + com.therealdanvega + jsontodb + 0.0.1-SNAPSHOT + jsontodb + Reading JSON and writing to a DB - UTF-8 - UTF-8 1.8 @@ -29,23 +23,19 @@ org.springframework.boot spring-boot-starter-actuator - - org.springframework.boot - spring-boot-actuator-docs - org.springframework.boot spring-boot-starter-data-jpa org.springframework.boot - spring-boot-starter-web + spring-boot-starter-hateoas org.springframework.boot - spring-boot-devtools - runtime + spring-boot-starter-web + com.h2database h2 @@ -68,9 +58,16 @@ org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + - - + \ No newline at end of file diff --git a/src/main/java/com/therealdanvega/controller/UserController.java b/src/main/java/com/therealdanvega/controller/UserController.java index db400dd..9f259f2 100644 --- a/src/main/java/com/therealdanvega/controller/UserController.java +++ b/src/main/java/com/therealdanvega/controller/UserController.java @@ -10,7 +10,7 @@ @RequestMapping("/users") public class UserController { - private UserService userService; + private final UserService userService; public UserController(UserService userService) { this.userService = userService; diff --git a/src/main/java/com/therealdanvega/domain/User.java b/src/main/java/com/therealdanvega/domain/User.java index f102c4c..e0b2cf4 100644 --- a/src/main/java/com/therealdanvega/domain/User.java +++ b/src/main/java/com/therealdanvega/domain/User.java @@ -1,13 +1,14 @@ package com.therealdanvega.domain; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Data; - import javax.persistence.*; -@Data -@AllArgsConstructor +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor @Entity public class User { @@ -24,6 +25,5 @@ public class User { private Address address; @Embedded private Company company; - - public User() {} + } diff --git a/src/main/java/com/therealdanvega/repository/UserRepository.java b/src/main/java/com/therealdanvega/repository/UserRepository.java index 3101b2f..3e128f5 100644 --- a/src/main/java/com/therealdanvega/repository/UserRepository.java +++ b/src/main/java/com/therealdanvega/repository/UserRepository.java @@ -1,9 +1,9 @@ package com.therealdanvega.repository; import com.therealdanvega.domain.User; -import org.springframework.data.repository.CrudRepository; +import org.springframework.data.jpa.repository.JpaRepository; -public interface UserRepository extends CrudRepository { +public interface UserRepository extends JpaRepository { diff --git a/src/main/java/com/therealdanvega/service/UserService.java b/src/main/java/com/therealdanvega/service/UserService.java index a98dfdd..40a8a44 100644 --- a/src/main/java/com/therealdanvega/service/UserService.java +++ b/src/main/java/com/therealdanvega/service/UserService.java @@ -9,7 +9,7 @@ @Service public class UserService { - private UserRepository userRepository; + private final UserRepository userRepository; public UserService(UserRepository userRepository) { this.userRepository = userRepository; @@ -24,6 +24,6 @@ public User save(User user) { } public void save(List users) { - userRepository.save(users); + userRepository.saveAll(users); } } diff --git a/src/main/resources/json/users.json b/src/main/resources/json/users.json index 3368cbf..428fb85 100644 --- a/src/main/resources/json/users.json +++ b/src/main/resources/json/users.json @@ -1,4 +1,4 @@ -// https://jsonplaceholder.typicode.com/users + [ { "id": 1, diff --git a/src/test/java/com/therealdanvega/JsontodbApplicationTest.java b/src/test/java/com/therealdanvega/JsontodbApplicationTest.java new file mode 100644 index 0000000..303a719 --- /dev/null +++ b/src/test/java/com/therealdanvega/JsontodbApplicationTest.java @@ -0,0 +1,21 @@ +package com.therealdanvega; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +/** + * + * @author AHE + */ + +@SpringBootTest +class JsontodbApplicationTest { + + public JsontodbApplicationTest() { + } + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/com/therealdanvega/JsontodbApplicationTests.java b/src/test/java/com/therealdanvega/JsontodbApplicationTests.java deleted file mode 100644 index 302cb71..0000000 --- a/src/test/java/com/therealdanvega/JsontodbApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.therealdanvega; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class JsontodbApplicationTests { - - @Test - public void contextLoads() { - } - -}