diff --git a/patched/1_01_user_with_lombok.patch b/patched/1_01_user_with_lombok.patch new file mode 100644 index 0000000..3ffcec1 --- /dev/null +++ b/patched/1_01_user_with_lombok.patch @@ -0,0 +1,69 @@ +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pom.xml (revision 35a21d499357b464ebb5b571cb97ac0bc5e57f01) ++++ pom.xml (revision 9838d0cefa7b1babfb52ff1702bcb490e934761c) +@@ -53,6 +53,14 @@ + + org.springframework.boot + spring-boot-maven-plugin ++ ++ ++ ++ org.projectlombok ++ lombok ++ ++ ++ + + + +Index: src/main/java/ru/javaops/bootjava/model/Role.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javaops/bootjava/model/Role.java (revision 9838d0cefa7b1babfb52ff1702bcb490e934761c) ++++ src/main/java/ru/javaops/bootjava/model/Role.java (revision 9838d0cefa7b1babfb52ff1702bcb490e934761c) +@@ -0,0 +1,6 @@ ++package ru.javaops.bootjava.model; ++ ++public enum Role { ++ ROLE_USER, ++ ROLE_ADMIN ++} +\ No newline at end of file +Index: src/main/java/ru/javaops/bootjava/model/User.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javaops/bootjava/model/User.java (revision 9838d0cefa7b1babfb52ff1702bcb490e934761c) ++++ src/main/java/ru/javaops/bootjava/model/User.java (revision 9838d0cefa7b1babfb52ff1702bcb490e934761c) +@@ -0,0 +1,23 @@ ++package ru.javaops.bootjava.model; ++ ++import lombok.AllArgsConstructor; ++import lombok.Data; ++import lombok.NoArgsConstructor; ++ ++import java.util.Set; ++ ++@Data ++@NoArgsConstructor ++@AllArgsConstructor ++public class User { ++ ++ private String email; ++ ++ private String firstName; ++ ++ private String lastName; ++ ++ private String password; ++ ++ private Set roles; ++} +\ No newline at end of file diff --git a/pom.xml b/pom.xml index ca66a72..5be7a42 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,14 @@ org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + diff --git a/src/main/java/ru/javaops/bootjava/model/Role.java b/src/main/java/ru/javaops/bootjava/model/Role.java new file mode 100644 index 0000000..432dde8 --- /dev/null +++ b/src/main/java/ru/javaops/bootjava/model/Role.java @@ -0,0 +1,6 @@ +package ru.javaops.bootjava.model; + +public enum Role { + ROLE_USER, + ROLE_ADMIN +} \ No newline at end of file diff --git a/src/main/java/ru/javaops/bootjava/model/User.java b/src/main/java/ru/javaops/bootjava/model/User.java new file mode 100644 index 0000000..b475761 --- /dev/null +++ b/src/main/java/ru/javaops/bootjava/model/User.java @@ -0,0 +1,23 @@ +package ru.javaops.bootjava.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Set; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class User { + + private String email; + + private String firstName; + + private String lastName; + + private String password; + + private Set roles; +} \ No newline at end of file