renamed file, fixed checkstyle mistakes

jv-jun23-team5 · Oct 2, 2023 · cce3d36 · cce3d36
1 parent 8d51559
commit cce3d36
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,16 +26,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.liquibase</groupId>-->
-<!--            <artifactId>liquibase-core</artifactId>-->
-<!--            <version>${liquibase.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.liquibase</groupId>-->
-<!--            <artifactId>liquibase-maven-plugin</artifactId>-->
-<!--            <version>${liquibase.version}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <version>${liquibase.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-maven-plugin</artifactId>
+            <version>${liquibase.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>mysql</groupId>
@@ -79,14 +79,14 @@
                     </excludes>
                 </configuration>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.liquibase</groupId>-->
-<!--                <artifactId>liquibase-maven-plugin</artifactId>-->
-<!--                <version>${liquibase.version}</version>-->
-<!--                <configuration>-->
-<!--                    <propertyFile>src/main/resources/liquibase.properties</propertyFile>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
+            <plugin>
+                <groupId>org.liquibase</groupId>
+                <artifactId>liquibase-maven-plugin</artifactId>
+                <version>${liquibase.version}</version>
+                <configuration>
+                    <propertyFile>src/main/resources/liquibase.properties</propertyFile>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/src/main/java/com/project/carsharingapp/model/Role.java b/src/main/java/com/project/carsharingapp/model/Role.java
@@ -8,10 +8,12 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
-@Data
+@Setter
+@Getter
 @Table(name = "roles")
 public class Role {
     @Id

diff --git a/src/main/java/com/project/carsharingapp/model/User.java b/src/main/java/com/project/carsharingapp/model/User.java
@@ -2,23 +2,23 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import jakarta.persistence.Table;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
 import java.util.HashSet;
 import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 @Entity
-@Data
+@Setter
+@Getter
 @SQLDelete(sql = "UPDATE users SET is_deleted = true WHERE id =?")
 @Where(clause = "is_deleted=false")
 @Table(name = "users")
@@ -40,8 +40,6 @@ public class User {
     @JoinTable(name = "user_roles",
             joinColumns = @JoinColumn(name = "user_id"),
             inverseJoinColumns = @JoinColumn(name = "role_id"))
-    @ToString.Exclude
-    @EqualsAndHashCode.Exclude
     private Set<Role> roles = new HashSet<>();
     @Column(name = "is_deleted",nullable = false)
     private boolean isDeleted = false;

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/car_sharing_db?serverTimezone=UTC
 spring.datasource.username=root
-spring.datasource.password=root123
+spring.datasource.password=gjujlf123$_0
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 server.servlet.context-path=/api

diff --git a/src/main/resources/db.changelog/db.changelog-master.yaml b/src/main/resources/db.changelog/db.changelog-master.yaml
diff --git a/...changelog/changes/create-roles-table.yaml → ...changelog/changes/create-roles-table.yaml b/...changelog/changes/create-roles-table.yaml → ...changelog/changes/create-roles-table.yaml
diff --git a/...elog/changes/create-user-roles-table.yaml → ...elog/changes/create-user-roles-table.yaml b/...elog/changes/create-user-roles-table.yaml → ...elog/changes/create-user-roles-table.yaml
diff --git a/...changelog/changes/create-users-table.yaml → ...changelog/changes/create-users-table.yaml b/...changelog/changes/create-users-table.yaml → ...changelog/changes/create-users-table.yaml
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -0,0 +1,7 @@
+databaseChangeLog:
+  - include:
+      file: db/changelog/changes/create-roles-table.yaml
+  - include:
+      file: /db/changelog/changes/create-users-table.yaml
+  - include:
+      file: /db/changelog/changes/create-user-roles-table.yaml
diff --git a/src/main/resources/liquibase.properties b/src/main/resources/liquibase.properties
@@ -0,0 +1,4 @@
+url=jdbc:mysql://localhost:3306/car_sharing_db?serverTimezone=UTC
+username=root
+password=gjujlf123$_0
+changeLogFile=/db.changelog/db.changelog-master.yaml