Merge pull request #91 from cardano-foundation/refactor/MET-1897-redu…

…ce-the-amount-of-common-repository refactor: remove common repository
cardano-foundation · Feb 15, 2024 · a48f096 · a48f096
2 parents e558f0c + 239c33b
commit a48f096
Show file tree

Hide file tree

Showing 52 changed files with 116 additions and 178 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,9 +13,7 @@
     <version.lombok>1.18.26</version.lombok>
     <org.projectlombok.version>1.18.24</org.projectlombok.version>
     <koios-java-client.version>1.18.1</koios-java-client.version>
-    <version.ledgersync-common>0.1.0-SNAPSHOT</version.ledgersync-common>
-    <version.explorer-common>0.1.1-SNAPSHOT</version.explorer-common>
-    <version.explorer-consumer-common>0.1.12</version.explorer-consumer-common>
+    <version.explorer-common>0.1.16-SNAPSHOT-PR173</version.explorer-common>
     <version.spring-boot>3.0.5</version.spring-boot>
     <version.flyway>9.16.0</version.flyway>
     <version.maven-compiler-plugin>3.10.0</version.maven-compiler-plugin>
@@ -61,16 +59,10 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.cardanofoundation.ledgersync</groupId>
-      <artifactId>common</artifactId>
-      <version>${version.ledgersync-common}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.cardanofoundation.explorer</groupId>
-      <artifactId>consumer-common</artifactId>
-      <version>${version.explorer-consumer-common}</version>
+      <artifactId>common</artifactId>
+      <version>${version.explorer-common}</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/concurrent/EpochConcurrentFetching.java b/src/main/java/org/cardanofoundation/explorer/rewards/concurrent/EpochConcurrentFetching.java
@@ -13,7 +13,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Epoch;
 import org.cardanofoundation.explorer.rewards.service.EpochFetchingService;
 
 @Component

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/controller/EpochController.java b/src/main/java/org/cardanofoundation/explorer/rewards/controller/EpochController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Epoch;
 import org.cardanofoundation.explorer.rewards.concurrent.EpochConcurrentFetching;
 
 @RestController

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/AdaPotsRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/AdaPotsRepository.java
@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.Param;
 
-import org.cardanofoundation.explorer.consumercommon.entity.AdaPots;
+import org.cardanofoundation.explorer.common.entity.ledgersync.AdaPots;
 
 public interface AdaPotsRepository extends JpaRepository<AdaPots, Integer> {
 

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/BlockRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/BlockRepository.java
@@ -4,7 +4,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Block;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Block;
 
 public interface BlockRepository extends JpaRepository<Block, Long> {
 

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/EpochRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/EpochRepository.java
@@ -10,7 +10,7 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Epoch;
 
 @Repository
 public interface EpochRepository extends JpaRepository<Epoch, Long> {

diff --git a/...ava/org/cardanofoundation/explorer/rewards/repository/EpochStakeCheckpointRepository.java b/...ava/org/cardanofoundation/explorer/rewards/repository/EpochStakeCheckpointRepository.java
@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStakeCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStakeCheckpoint;
 
 @Repository
 public interface EpochStakeCheckpointRepository extends JpaRepository<EpochStakeCheckpoint, Long> {

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/EpochStakeRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/EpochStakeRepository.java
@@ -3,7 +3,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStake;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStake;
 
 @Repository
 public interface EpochStakeRepository extends JpaRepository<EpochStake, Long> {}
diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/PoolHashRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/PoolHashRepository.java
@@ -7,7 +7,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHash;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHash;
 
 @Repository
 public interface PoolHashRepository extends JpaRepository<PoolHash, Long> {

diff --git a/...va/org/cardanofoundation/explorer/rewards/repository/PoolHistoryCheckpointRepository.java b/...va/org/cardanofoundation/explorer/rewards/repository/PoolHistoryCheckpointRepository.java
@@ -6,7 +6,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistoryCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistoryCheckpoint;
 
 @Repository
 public interface PoolHistoryCheckpointRepository

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/PoolHistoryRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/PoolHistoryRepository.java
@@ -3,7 +3,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistory;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistory;
 
 @Repository
 public interface PoolHistoryRepository extends JpaRepository<PoolHistory, Long> {}
diff --git a/.../java/org/cardanofoundation/explorer/rewards/repository/PoolInfoCheckpointRepository.java b/.../java/org/cardanofoundation/explorer/rewards/repository/PoolInfoCheckpointRepository.java
@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfoCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfoCheckpoint;
 
 @Repository
 public interface PoolInfoCheckpointRepository extends JpaRepository<PoolInfoCheckpoint, Long> {

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/PoolInfoRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/PoolInfoRepository.java
@@ -3,7 +3,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfo;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfo;
 
 @Repository
 public interface PoolInfoRepository extends JpaRepository<PoolInfo, Long> {}
diff --git a/...in/java/org/cardanofoundation/explorer/rewards/repository/RewardCheckpointRepository.java b/...in/java/org/cardanofoundation/explorer/rewards/repository/RewardCheckpointRepository.java
@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.RewardCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.RewardCheckpoint;
 
 @Repository
 public interface RewardCheckpointRepository extends JpaRepository<RewardCheckpoint, Long> {

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/RewardRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/RewardRepository.java
@@ -3,7 +3,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Reward;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Reward;
 
 @Repository
 public interface RewardRepository extends JpaRepository<Reward, Long> {}
diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/repository/StakeAddressRepository.java b/src/main/java/org/cardanofoundation/explorer/rewards/repository/StakeAddressRepository.java
@@ -6,7 +6,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress;
+import org.cardanofoundation.explorer.common.entity.ledgersync.StakeAddress;
 
 @Repository
 public interface StakeAddressRepository extends JpaRepository<StakeAddress, Long> {

diff --git a/...ardanofoundation/explorer/rewards/repository/jooq/JOOQEpochStakeCheckpointRepository.java b/...ardanofoundation/explorer/rewards/repository/jooq/JOOQEpochStakeCheckpointRepository.java
@@ -13,9 +13,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStakeCheckpoint;
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStakeCheckpoint_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStakeCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStakeCheckpoint_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQEpochStakeCheckpointRepository {

diff --git a/...java/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQEpochStakeRepository.java b/...java/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQEpochStakeRepository.java
@@ -14,9 +14,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStake;
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStake_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStake;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStake_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQEpochStakeRepository {

diff --git a/...rdanofoundation/explorer/rewards/repository/jooq/JOOQPoolHistoryCheckpointRepository.java b/...rdanofoundation/explorer/rewards/repository/jooq/JOOQPoolHistoryCheckpointRepository.java
@@ -13,9 +13,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistoryCheckpoint;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistoryCheckpoint_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistoryCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistoryCheckpoint_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQPoolHistoryCheckpointRepository {

diff --git a/...ava/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQPoolHistoryRepository.java b/...ava/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQPoolHistoryRepository.java
@@ -12,9 +12,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistory;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistory_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistory;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistory_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQPoolHistoryRepository {

diff --git a/.../cardanofoundation/explorer/rewards/repository/jooq/JOOQPoolInfoCheckpointRepository.java b/.../cardanofoundation/explorer/rewards/repository/jooq/JOOQPoolInfoCheckpointRepository.java
@@ -12,9 +12,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfoCheckpoint;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfoCheckpoint_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfoCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfoCheckpoint_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQPoolInfoCheckpointRepository {

diff --git a/...n/java/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQPoolInfoRepository.java b/...n/java/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQPoolInfoRepository.java
@@ -12,9 +12,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfo;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfo_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfo;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfo_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQPoolInfoRepository {

diff --git a/...rg/cardanofoundation/explorer/rewards/repository/jooq/JOOQRewardCheckpointRepository.java b/...rg/cardanofoundation/explorer/rewards/repository/jooq/JOOQRewardCheckpointRepository.java
@@ -12,9 +12,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.RewardCheckpoint;
-import org.cardanofoundation.explorer.consumercommon.entity.RewardCheckpoint_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.RewardCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.RewardCheckpoint_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Component
 public class JOOQRewardCheckpointRepository {

diff --git a/...ain/java/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQRewardRepository.java b/...ain/java/org/cardanofoundation/explorer/rewards/repository/jooq/JOOQRewardRepository.java
@@ -14,9 +14,9 @@
 import org.jooq.DSLContext;
 import org.jooq.Query;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Reward;
-import org.cardanofoundation.explorer.consumercommon.entity.Reward_;
-import org.cardanofoundation.explorer.rewards.util.EntityUtil;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Reward;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Reward_;
+import org.cardanofoundation.explorer.common.utils.EntityUtil;
 
 @Repository
 public class JOOQRewardRepository {

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/schedule/PoolInfoDataSchedule.java b/src/main/java/org/cardanofoundation/explorer/rewards/schedule/PoolInfoDataSchedule.java
@@ -18,7 +18,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHash;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHash;
 import org.cardanofoundation.explorer.rewards.repository.PoolHashRepository;
 import org.cardanofoundation.explorer.rewards.schedule.service.PoolInfoDataService;
 

diff --git a/...ain/java/org/cardanofoundation/explorer/rewards/schedule/service/PoolInfoDataService.java b/...ain/java/org/cardanofoundation/explorer/rewards/schedule/service/PoolInfoDataService.java
@@ -20,8 +20,8 @@
 import io.micrometer.common.util.StringUtils;
 import rest.koios.client.backend.api.base.exception.ApiException;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHash;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfo;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHash;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfo;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.PoolHashRepository;
 import org.cardanofoundation.explorer.rewards.repository.jooq.JOOQPoolInfoRepository;

diff --git a/src/main/java/org/cardanofoundation/explorer/rewards/service/EpochFetchingService.java b/src/main/java/org/cardanofoundation/explorer/rewards/service/EpochFetchingService.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Epoch;
 
 public interface EpochFetchingService {
 

diff --git a/.../java/org/cardanofoundation/explorer/rewards/service/impl/AdaPotsFetchingServiceImpl.java b/.../java/org/cardanofoundation/explorer/rewards/service/impl/AdaPotsFetchingServiceImpl.java
@@ -17,8 +17,8 @@
 
 import rest.koios.client.backend.api.network.model.Totals;
 
-import org.cardanofoundation.explorer.consumercommon.entity.AdaPots;
-import org.cardanofoundation.explorer.consumercommon.entity.Block;
+import org.cardanofoundation.explorer.common.entity.ledgersync.AdaPots;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Block;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.AdaPotsRepository;
 import org.cardanofoundation.explorer.rewards.repository.BlockRepository;

diff --git a/...in/java/org/cardanofoundation/explorer/rewards/service/impl/EpochFetchingServiceImpl.java b/...in/java/org/cardanofoundation/explorer/rewards/service/impl/EpochFetchingServiceImpl.java
@@ -18,8 +18,8 @@
 
 import io.micrometer.common.util.StringUtils;
 
-import org.cardanofoundation.explorer.consumercommon.entity.Epoch;
-import org.cardanofoundation.explorer.consumercommon.enumeration.EraType;
+import org.cardanofoundation.explorer.common.entity.enumeration.EraType;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Epoch;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.EpochRepository;
 import org.cardanofoundation.explorer.rewards.service.EpochFetchingService;

diff --git a/...va/org/cardanofoundation/explorer/rewards/service/impl/EpochStakeFetchingServiceImpl.java b/...va/org/cardanofoundation/explorer/rewards/service/impl/EpochStakeFetchingServiceImpl.java
@@ -23,10 +23,10 @@
 import rest.koios.client.backend.api.account.model.AccountHistoryInner;
 import rest.koios.client.backend.api.base.exception.ApiException;
 
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStake;
-import org.cardanofoundation.explorer.consumercommon.entity.EpochStakeCheckpoint;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHash;
-import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStake;
+import org.cardanofoundation.explorer.common.entity.ledgersync.EpochStakeCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHash;
+import org.cardanofoundation.explorer.common.entity.ledgersync.StakeAddress;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.EpochStakeCheckpointRepository;
 import org.cardanofoundation.explorer.rewards.repository.PoolHashRepository;

diff --git a/...a/org/cardanofoundation/explorer/rewards/service/impl/PoolHistoryFetchingServiceImpl.java b/...a/org/cardanofoundation/explorer/rewards/service/impl/PoolHistoryFetchingServiceImpl.java
@@ -21,8 +21,8 @@
 import io.micrometer.common.util.StringUtils;
 import rest.koios.client.backend.api.base.exception.ApiException;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistory;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHistoryCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistory;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHistoryCheckpoint;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.PoolHashRepository;
 import org.cardanofoundation.explorer.rewards.repository.PoolHistoryCheckpointRepository;

diff --git a/...java/org/cardanofoundation/explorer/rewards/service/impl/PoolInfoFetchingServiceImpl.java b/...java/org/cardanofoundation/explorer/rewards/service/impl/PoolInfoFetchingServiceImpl.java
@@ -20,9 +20,9 @@
 import io.micrometer.common.util.StringUtils;
 import rest.koios.client.backend.api.base.exception.ApiException;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHash;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfo;
-import org.cardanofoundation.explorer.consumercommon.entity.PoolInfoCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHash;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfo;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolInfoCheckpoint;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.PoolHashRepository;
 import org.cardanofoundation.explorer.rewards.repository.jooq.JOOQPoolInfoCheckpointRepository;

diff --git a/...n/java/org/cardanofoundation/explorer/rewards/service/impl/RewardFetchingServiceImpl.java b/...n/java/org/cardanofoundation/explorer/rewards/service/impl/RewardFetchingServiceImpl.java
@@ -23,11 +23,11 @@
 import rest.koios.client.backend.api.account.model.AccountRewards;
 import rest.koios.client.backend.api.base.exception.ApiException;
 
-import org.cardanofoundation.explorer.consumercommon.entity.PoolHash;
-import org.cardanofoundation.explorer.consumercommon.entity.Reward;
-import org.cardanofoundation.explorer.consumercommon.entity.RewardCheckpoint;
-import org.cardanofoundation.explorer.consumercommon.entity.StakeAddress;
-import org.cardanofoundation.explorer.consumercommon.enumeration.RewardType;
+import org.cardanofoundation.explorer.common.entity.enumeration.RewardType;
+import org.cardanofoundation.explorer.common.entity.ledgersync.PoolHash;
+import org.cardanofoundation.explorer.common.entity.ledgersync.Reward;
+import org.cardanofoundation.explorer.common.entity.ledgersync.RewardCheckpoint;
+import org.cardanofoundation.explorer.common.entity.ledgersync.StakeAddress;
 import org.cardanofoundation.explorer.rewards.config.KoiosClient;
 import org.cardanofoundation.explorer.rewards.repository.PoolHashRepository;
 import org.cardanofoundation.explorer.rewards.repository.RewardCheckpointRepository;