Skip to content

Commit

Permalink
Move AuditingEntityListener to common (#1286)
Browse files Browse the repository at this point in the history
Co-authored-by: Tri Phung Quang Minh <[email protected]>
  • Loading branch information
minhtridn2001 and Tri Phung Quang Minh authored Dec 13, 2024
1 parent 0887136 commit 9b4e16d
Show file tree
Hide file tree
Showing 52 changed files with 110 additions and 731 deletions.

This file was deleted.

33 changes: 0 additions & 33 deletions cart/src/main/java/com/yas/cart/model/AbstractAuditEntity.java

This file was deleted.

3 changes: 3 additions & 0 deletions cart/src/main/java/com/yas/cart/model/CartItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.Table;

import com.yas.commonlibrary.model.AbstractAuditEntity;

Check warning on line 8 in cart/src/main/java/com/yas/cart/model/CartItem.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'com.yas.commonlibrary.model.AbstractAuditEntity'

Check warning on line 8 in cart/src/main/java/com/yas/cart/model/CartItem.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Wrong lexicographical order for 'com.yas.commonlibrary.model.AbstractAuditEntity' import. Should be before 'jakarta.persistence.Table'.

import lombok.AllArgsConstructor;

Check warning on line 10 in cart/src/main/java/com/yas/cart/model/CartItem.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'lombok.AllArgsConstructor'
import lombok.Builder;
import lombok.NoArgsConstructor;
Expand Down
5 changes: 4 additions & 1 deletion common-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.yas.inventory.model;
package com.yas.commonlibrary.model;

import com.yas.inventory.listener.CustomAuditingEntityListener;
import com.yas.commonlibrary.model.listener.CustomAuditingEntityListener;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.MappedSuperclass;
import java.time.ZonedDateTime;
Expand Down Expand Up @@ -28,4 +28,4 @@ public class AbstractAuditEntity {

@LastModifiedBy
private String lastModifiedBy;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.yas.payment.listener;
package com.yas.commonlibrary.model.listener;

import com.yas.payment.model.AbstractAuditEntity;
import com.yas.commonlibrary.model.AbstractAuditEntity;
import jakarta.persistence.PrePersist;
import jakarta.persistence.PreUpdate;
import org.springframework.beans.factory.ObjectFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package com.yas.customer.listener;
package com.yas.commonlibrary.model.listener;

import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.yas.customer.model.AbstractAuditEntity;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.data.auditing.AuditingHandler;

import com.yas.commonlibrary.model.AbstractAuditEntity;

class CustomAuditingEntityListenerTest {

private ObjectFactory<AuditingHandler> auditingHandlerFactory;
Expand Down Expand Up @@ -64,4 +65,4 @@ void testTouchForUpdate_whenLastModifiedByIsNotNull_markModified() {
listener.touchForUpdate(entity);
verify(auditingHandler, never()).markModified(entity);
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;

import com.yas.commonlibrary.model.AbstractAuditEntity;

Check warning on line 9 in customer/src/main/java/com/yas/customer/model/UserAddress.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'com.yas.commonlibrary.model.AbstractAuditEntity'

Check warning on line 9 in customer/src/main/java/com/yas/customer/model/UserAddress.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Wrong lexicographical order for 'com.yas.commonlibrary.model.AbstractAuditEntity' import. Should be before 'jakarta.persistence.Table'.

import lombok.AllArgsConstructor;

Check warning on line 11 in customer/src/main/java/com/yas/customer/model/UserAddress.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'lombok.AllArgsConstructor'
import lombok.Builder;
import lombok.Getter;
Expand All @@ -28,4 +31,4 @@ public class UserAddress extends AbstractAuditEntity {
private Long addressId;

private Boolean isActive;
}
}

This file was deleted.

5 changes: 4 additions & 1 deletion inventory/src/main/java/com/yas/inventory/model/Stock.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;

import com.yas.commonlibrary.model.AbstractAuditEntity;

Check warning on line 12 in inventory/src/main/java/com/yas/inventory/model/Stock.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'com.yas.commonlibrary.model.AbstractAuditEntity'

Check warning on line 12 in inventory/src/main/java/com/yas/inventory/model/Stock.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Wrong lexicographical order for 'com.yas.commonlibrary.model.AbstractAuditEntity' import. Should be before 'jakarta.persistence.Table'.

import lombok.AccessLevel;

Check warning on line 14 in inventory/src/main/java/com/yas/inventory/model/Stock.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'lombok.AccessLevel'
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down Expand Up @@ -38,4 +41,4 @@ public class Stock extends AbstractAuditEntity {
@ManyToOne
@JoinColumn(name = "warehouse_id", nullable = false)
private Warehouse warehouse;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;

import com.yas.commonlibrary.model.AbstractAuditEntity;

Check warning on line 12 in inventory/src/main/java/com/yas/inventory/model/StockHistory.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'com.yas.commonlibrary.model.AbstractAuditEntity'

Check warning on line 12 in inventory/src/main/java/com/yas/inventory/model/StockHistory.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Wrong lexicographical order for 'com.yas.commonlibrary.model.AbstractAuditEntity' import. Should be before 'jakarta.persistence.Table'.

import lombok.AccessLevel;

Check warning on line 14 in inventory/src/main/java/com/yas/inventory/model/StockHistory.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'lombok.AccessLevel'
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down Expand Up @@ -39,4 +42,4 @@ public class StockHistory extends AbstractAuditEntity {
@ManyToOne
@JoinColumn(name = "warehouse_id", nullable = false)
private Warehouse warehouse;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;

import com.yas.commonlibrary.model.AbstractAuditEntity;

Check warning on line 10 in inventory/src/main/java/com/yas/inventory/model/Warehouse.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'com.yas.commonlibrary.model.AbstractAuditEntity'

Check warning on line 10 in inventory/src/main/java/com/yas/inventory/model/Warehouse.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Wrong lexicographical order for 'com.yas.commonlibrary.model.AbstractAuditEntity' import. Should be before 'jakarta.persistence.Table'.

import lombok.AccessLevel;

Check warning on line 12 in inventory/src/main/java/com/yas/inventory/model/Warehouse.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck

Extra separation in import group before 'lombok.AccessLevel'
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -30,4 +33,4 @@ public class Warehouse extends AbstractAuditEntity {
private String name;

private Long addressId;
}
}

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9b4e16d

Please sign in to comment.