Refactor: Changing packages structure, cleaning up JPA entities (RA-79)

cardano-foundation · May 17, 2024 · 08f32df · 08f32df
1 parent 5a1c5e2
commit 08f32df
Show file tree

Hide file tree

Showing 62 changed files with 404 additions and 784 deletions.
diff --git a/api/src/main/java/org/cardanofoundation/rosetta/RosettaApiApplication.java b/api/src/main/java/org/cardanofoundation/rosetta/RosettaApiApplication.java
@@ -14,6 +14,7 @@
 import org.springframework.core.Ordered;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.filter.CommonsRequestLoggingFilter;
 import org.springframework.web.filter.ForwardedHeaderFilter;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
@@ -58,4 +59,15 @@ public JsonNullableModule jsonNullableModule() {
   public RestTemplate restTemplate(RestTemplateBuilder builder) {
     return builder.build();
   }
+
+  @Bean
+  public CommonsRequestLoggingFilter logFilter() {
+    CommonsRequestLoggingFilter filter = new CommonsRequestLoggingFilter();
+    filter.setIncludeQueryString(true);
+    filter.setIncludePayload(true);
+    filter.setMaxPayloadLength(10000);
+    filter.setIncludeHeaders(false);
+    filter.setAfterMessagePrefix("REQUEST DATA: \n");
+    return filter;
+  }
 }
diff --git a/...ain/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressBalanceEntity.java b/...ain/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressBalanceEntity.java
@@ -8,21 +8,16 @@
 import jakarta.persistence.Table;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
-import org.hibernate.annotations.DynamicUpdate;
 
-
-@Data
+@Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@SuperBuilder
 @Entity
 @Table(name = "address_balance")
 @IdClass(AddressBalanceId.class)
-@DynamicUpdate
 public class AddressBalanceEntity {
 
   @Id

diff --git a/...rc/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressBalanceId.java b/...rc/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressBalanceId.java
@@ -1,27 +1,13 @@
 package org.cardanofoundation.rosetta.api.account.model.entity;
 
 import java.io.Serializable;
-import jakarta.persistence.Column;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
 @EqualsAndHashCode
-@Builder
 public class AddressBalanceId implements Serializable {
 
-  @Column(name = "address")
   private String address;
-
-  @Column(name = "unit")
   private String unit;
-
-  @Column(name = "slot")
   private Long slot;
 }
diff --git a/...c/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressUtxoEntity.java b/...c/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressUtxoEntity.java
@@ -8,24 +8,20 @@
 import jakarta.persistence.Table;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import io.hypersistence.utils.hibernate.type.json.JsonType;
-import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
 import org.cardanofoundation.rosetta.api.account.model.domain.Amt;
 
-@Data
+@Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@SuperBuilder
 @Entity
 @Table(name = "address_utxo")
 @IdClass(UtxoId.class)
-@DynamicUpdate
 public class AddressUtxoEntity {
 
   @Id

diff --git a/...ava/org/cardanofoundation/rosetta/api/account/model/entity/StakeAddressBalanceEntity.java b/...ava/org/cardanofoundation/rosetta/api/account/model/entity/StakeAddressBalanceEntity.java
@@ -7,25 +7,18 @@
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import org.hibernate.annotations.DynamicUpdate;
 
 import org.cardanofoundation.rosetta.api.block.model.entity.BlockAwareEntity;
 
 @EqualsAndHashCode(callSuper = true)
-@Data
 @NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
+@Getter
 @Entity
 @Table(name = "stake_address_balance")
 @IdClass(StakeAddressBalanceId.class)
-@DynamicUpdate
 public class StakeAddressBalanceEntity extends BlockAwareEntity {
 
   @Id

diff --git a/...in/java/org/cardanofoundation/rosetta/api/account/model/entity/StakeAddressBalanceId.java b/...in/java/org/cardanofoundation/rosetta/api/account/model/entity/StakeAddressBalanceId.java
@@ -1,23 +1,12 @@
 package org.cardanofoundation.rosetta.api.account.model.entity;
 
 import java.io.Serializable;
-import jakarta.persistence.Column;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
 @EqualsAndHashCode
-@Builder
 public class StakeAddressBalanceId implements Serializable {
 
-  @Column(name = "address")
   private String address;
-  @Column(name = "slot")
   private Long slot;
 }
diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/UtxoId.java b/api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/UtxoId.java
@@ -1,24 +1,12 @@
 package org.cardanofoundation.rosetta.api.account.model.entity;
 
 import java.io.Serializable;
-import jakarta.persistence.Column;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
 @EqualsAndHashCode
-@Builder
 public class UtxoId implements Serializable {
 
-  @Column(name = "tx_hash")
   private String txHash;
-
-  @Column(name = "output_index")
   private Integer outputIndex;
 }
diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/account/service/AccountServiceImpl.java b/api/src/main/java/org/cardanofoundation/rosetta/api/account/service/AccountServiceImpl.java
@@ -20,9 +20,9 @@
 import org.cardanofoundation.rosetta.api.block.model.domain.Block;
 import org.cardanofoundation.rosetta.api.block.model.domain.StakeAddressBalance;
 import org.cardanofoundation.rosetta.api.block.service.LedgerBlockService;
+import org.cardanofoundation.rosetta.api.construction.service.LedgerDataProviderService;
 import org.cardanofoundation.rosetta.common.exception.ExceptionFactory;
 import org.cardanofoundation.rosetta.common.mapper.DataMapper;
-import org.cardanofoundation.rosetta.common.services.LedgerDataProviderService;
 import org.cardanofoundation.rosetta.common.util.CardanoAddressUtils;
 import org.cardanofoundation.rosetta.common.util.ValidationUtil;
 
@@ -83,7 +83,7 @@ public AccountCoinsResponse getAccountCoins(AccountCoinsRequest accountCoinsRequ
   private AccountBalanceResponse findBalanceDataByAddressAndBlock(String address, Long number,
       String hash) {
 
-    return  findBlockOrLast(number, hash)
+    return findBlockOrLast(number, hash)
         .map(blockDto -> {
           log.info("Looking for utxos for address {} and block {}",
               address,

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/BlockAwareEntity.java b/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/BlockAwareEntity.java
@@ -4,18 +4,14 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
-import org.hibernate.annotations.UpdateTimestamp;
-
-@Data
-@MappedSuperclass
+@Getter
+@EqualsAndHashCode
 @NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
+@MappedSuperclass
 public class BlockAwareEntity {
 
   @Column(name = "block")
@@ -24,7 +20,6 @@ public class BlockAwareEntity {
   @Column(name = "block_time")
   private Long blockTime;
 
-  @UpdateTimestamp
   @Column(name = "update_datetime")
   private LocalDateTime updateDateTime;
 

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/BlockEntity.java b/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/BlockEntity.java
@@ -14,13 +14,11 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 
-
-@Data
+@Getter
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
@@ -44,7 +42,6 @@ public class BlockEntity {
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "prev_hash",
       foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT, name = "none"))
-  @EqualsAndHashCode.Exclude
   private BlockEntity prev;
 
   @OneToMany(fetch = FetchType.LAZY, mappedBy = "block")

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/DelegationEntity.java b/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/DelegationEntity.java
@@ -6,15 +6,11 @@
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
-@Data
+@Getter
 @NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
 @Entity
 @Table(name = "delegation")
 @IdClass(DelegationId.class)

diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/DelegationId.java b/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/DelegationId.java
@@ -1,15 +1,12 @@
 package org.cardanofoundation.rosetta.api.block.model.entity;
 
 import java.io.Serializable;
-import jakarta.persistence.Column;
 
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode
 public class DelegationId implements Serializable {
 
-  @Column(name = "tx_hash")
   private String txHash;
-  @Column(name = "cert_index")
   private long certIndex;
 }
diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/EpochParamEntity.java b/api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/EpochParamEntity.java
@@ -3,26 +3,20 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.PrePersist;
 import jakarta.persistence.Table;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-import lombok.extern.slf4j.Slf4j;
 
 import io.hypersistence.utils.hibernate.type.json.JsonType;
 import org.hibernate.annotations.Type;
 
-
-@Data
-@NoArgsConstructor
+@Getter
 @AllArgsConstructor
-@SuperBuilder
+@NoArgsConstructor
 @Entity
 @Table(name = "epoch_param")
-@Slf4j
 public class EpochParamEntity {
 
   @Id
@@ -33,15 +27,4 @@ public class EpochParamEntity {
   @Column(name = "params", columnDefinition = "json")
   private ProtocolParamsEntity params;
 
-  @PrePersist
-  public void preSave() {
-    if (this.getParams() == null) {
-      return;
-    }
-
-    //reset these fields
-    if (this.getParams().getCostModels() != null) {
-      this.getParams().setCostModels(null);
-    }
-  }
 }
diff --git a/...ain/java/org/cardanofoundation/rosetta/api/block/model/entity/PoolRegistrationEntity.java b/...ain/java/org/cardanofoundation/rosetta/api/block/model/entity/PoolRegistrationEntity.java
@@ -9,24 +9,18 @@
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import com.bloxbean.cardano.yaci.core.model.Relay;
 import io.hypersistence.utils.hibernate.type.json.JsonType;
-import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
-@Data
+@Getter
 @NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
 @Entity
 @Table(name = "pool_registration")
 @IdClass(PoolRegistrationId.class)
-@DynamicUpdate
 public class PoolRegistrationEntity {
 
   @Id

diff --git a/...rc/main/java/org/cardanofoundation/rosetta/api/block/model/entity/PoolRegistrationId.java b/...rc/main/java/org/cardanofoundation/rosetta/api/block/model/entity/PoolRegistrationId.java
@@ -1,16 +1,12 @@
 package org.cardanofoundation.rosetta.api.block.model.entity;
 
 import java.io.Serializable;
-import jakarta.persistence.Column;
 
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode
 public class PoolRegistrationId implements Serializable {
 
-  @Column(name = "tx_hash")
   private String txHash;
-
-  @Column(name = "cert_index")
   private int certIndex;
 }