Skip to content

Commit 08f32df

Browse files
BerezinDBerezinD
authored
Refactor: Changing packages structure, cleaning up JPA entities (RA-79)
1 parent 5a1c5e2 commit 08f32df

File tree

62 files changed

+404
-784
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+404
-784
lines changed

‎api/src/main/java/org/cardanofoundation/rosetta/RosettaApiApplication.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.springframework.core.Ordered;
1515
import org.springframework.scheduling.annotation.EnableScheduling;
1616
import org.springframework.web.client.RestTemplate;
17+
import org.springframework.web.filter.CommonsRequestLoggingFilter;
1718
import org.springframework.web.filter.ForwardedHeaderFilter;
1819
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
1920
import io.swagger.v3.oas.annotations.info.Info;
@@ -58,4 +59,15 @@ public JsonNullableModule jsonNullableModule() {
5859
public RestTemplate restTemplate(RestTemplateBuilder builder) {
5960
return builder.build();
6061
}
62+
63+
@Bean
64+
public CommonsRequestLoggingFilter logFilter() {
65+
CommonsRequestLoggingFilter filter = new CommonsRequestLoggingFilter();
66+
filter.setIncludeQueryString(true);
67+
filter.setIncludePayload(true);
68+
filter.setMaxPayloadLength(10000);
69+
filter.setIncludeHeaders(false);
70+
filter.setAfterMessagePrefix("REQUEST DATA: \n");
71+
return filter;
72+
}
6173
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressBalanceEntity.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,16 @@
88
import jakarta.persistence.Table;
99

1010
import lombok.AllArgsConstructor;
11-
import lombok.Data;
11+
import lombok.Getter;
1212
import lombok.NoArgsConstructor;
13-
import lombok.experimental.SuperBuilder;
1413

15-
import org.hibernate.annotations.DynamicUpdate;
1614

17-
18-
@Data
15+
@Getter
1916
@NoArgsConstructor
2017
@AllArgsConstructor
21-
@SuperBuilder
2218
@Entity
2319
@Table(name = "address_balance")
2420
@IdClass(AddressBalanceId.class)
25-
@DynamicUpdate
2621
public class AddressBalanceEntity {
2722

2823
@Id

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressBalanceId.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
package org.cardanofoundation.rosetta.api.account.model.entity;
22

33
import java.io.Serializable;
4-
import jakarta.persistence.Column;
54

6-
import lombok.AllArgsConstructor;
7-
import lombok.Builder;
85
import lombok.EqualsAndHashCode;
9-
import lombok.Getter;
10-
import lombok.NoArgsConstructor;
116

12-
@Getter
13-
@NoArgsConstructor
14-
@AllArgsConstructor
157
@EqualsAndHashCode
16-
@Builder
178
public class AddressBalanceId implements Serializable {
189

19-
@Column(name = "address")
2010
private String address;
21-
22-
@Column(name = "unit")
2311
private String unit;
24-
25-
@Column(name = "slot")
2612
private Long slot;
2713
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/AddressUtxoEntity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,20 @@
88
import jakarta.persistence.Table;
99

1010
import lombok.AllArgsConstructor;
11-
import lombok.Data;
11+
import lombok.Getter;
1212
import lombok.NoArgsConstructor;
13-
import lombok.experimental.SuperBuilder;
1413

1514
import io.hypersistence.utils.hibernate.type.json.JsonType;
16-
import org.hibernate.annotations.DynamicUpdate;
1715
import org.hibernate.annotations.Type;
1816

1917
import org.cardanofoundation.rosetta.api.account.model.domain.Amt;
2018

21-
@Data
19+
@Getter
2220
@NoArgsConstructor
2321
@AllArgsConstructor
24-
@SuperBuilder
2522
@Entity
2623
@Table(name = "address_utxo")
2724
@IdClass(UtxoId.class)
28-
@DynamicUpdate
2925
public class AddressUtxoEntity {
3026

3127
@Id

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/StakeAddressBalanceEntity.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,18 @@
77
import jakarta.persistence.IdClass;
88
import jakarta.persistence.Table;
99

10-
import lombok.AllArgsConstructor;
11-
import lombok.Data;
1210
import lombok.EqualsAndHashCode;
11+
import lombok.Getter;
1312
import lombok.NoArgsConstructor;
14-
import lombok.experimental.SuperBuilder;
15-
16-
import org.hibernate.annotations.DynamicUpdate;
1713

1814
import org.cardanofoundation.rosetta.api.block.model.entity.BlockAwareEntity;
1915

2016
@EqualsAndHashCode(callSuper = true)
21-
@Data
2217
@NoArgsConstructor
23-
@AllArgsConstructor
24-
@SuperBuilder
18+
@Getter
2519
@Entity
2620
@Table(name = "stake_address_balance")
2721
@IdClass(StakeAddressBalanceId.class)
28-
@DynamicUpdate
2922
public class StakeAddressBalanceEntity extends BlockAwareEntity {
3023

3124
@Id

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/StakeAddressBalanceId.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
package org.cardanofoundation.rosetta.api.account.model.entity;
22

33
import java.io.Serializable;
4-
import jakarta.persistence.Column;
54

6-
import lombok.AllArgsConstructor;
7-
import lombok.Builder;
85
import lombok.EqualsAndHashCode;
9-
import lombok.Getter;
10-
import lombok.NoArgsConstructor;
116

12-
@Getter
13-
@NoArgsConstructor
14-
@AllArgsConstructor
157
@EqualsAndHashCode
16-
@Builder
178
public class StakeAddressBalanceId implements Serializable {
189

19-
@Column(name = "address")
2010
private String address;
21-
@Column(name = "slot")
2211
private Long slot;
2312
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/model/entity/UtxoId.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
package org.cardanofoundation.rosetta.api.account.model.entity;
22

33
import java.io.Serializable;
4-
import jakarta.persistence.Column;
54

6-
import lombok.AllArgsConstructor;
7-
import lombok.Builder;
85
import lombok.EqualsAndHashCode;
9-
import lombok.Getter;
10-
import lombok.NoArgsConstructor;
116

12-
@Getter
13-
@NoArgsConstructor
14-
@AllArgsConstructor
157
@EqualsAndHashCode
16-
@Builder
178
public class UtxoId implements Serializable {
189

19-
@Column(name = "tx_hash")
2010
private String txHash;
21-
22-
@Column(name = "output_index")
2311
private Integer outputIndex;
2412
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/service/AccountServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.cardanofoundation.rosetta.api.block.model.domain.Block;
2121
import org.cardanofoundation.rosetta.api.block.model.domain.StakeAddressBalance;
2222
import org.cardanofoundation.rosetta.api.block.service.LedgerBlockService;
23+
import org.cardanofoundation.rosetta.api.construction.service.LedgerDataProviderService;
2324
import org.cardanofoundation.rosetta.common.exception.ExceptionFactory;
2425
import org.cardanofoundation.rosetta.common.mapper.DataMapper;
25-
import org.cardanofoundation.rosetta.common.services.LedgerDataProviderService;
2626
import org.cardanofoundation.rosetta.common.util.CardanoAddressUtils;
2727
import org.cardanofoundation.rosetta.common.util.ValidationUtil;
2828

@@ -83,7 +83,7 @@ public AccountCoinsResponse getAccountCoins(AccountCoinsRequest accountCoinsRequ
8383
private AccountBalanceResponse findBalanceDataByAddressAndBlock(String address, Long number,
8484
String hash) {
8585

86-
return findBlockOrLast(number, hash)
86+
return findBlockOrLast(number, hash)
8787
.map(blockDto -> {
8888
log.info("Looking for utxos for address {} and block {}",
8989
address,

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/BlockAwareEntity.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@
44
import jakarta.persistence.Column;
55
import jakarta.persistence.MappedSuperclass;
66

7-
import lombok.AllArgsConstructor;
8-
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
8+
import lombok.Getter;
99
import lombok.NoArgsConstructor;
10-
import lombok.experimental.SuperBuilder;
1110

12-
import org.hibernate.annotations.UpdateTimestamp;
13-
14-
@Data
15-
@MappedSuperclass
11+
@Getter
12+
@EqualsAndHashCode
1613
@NoArgsConstructor
17-
@AllArgsConstructor
18-
@SuperBuilder
14+
@MappedSuperclass
1915
public class BlockAwareEntity {
2016

2117
@Column(name = "block")
@@ -24,7 +20,6 @@ public class BlockAwareEntity {
2420
@Column(name = "block_time")
2521
private Long blockTime;
2622

27-
@UpdateTimestamp
2823
@Column(name = "update_datetime")
2924
private LocalDateTime updateDateTime;
3025

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/BlockEntity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@
1414

1515
import lombok.AllArgsConstructor;
1616
import lombok.Builder;
17-
import lombok.Data;
18-
import lombok.EqualsAndHashCode;
17+
import lombok.Getter;
1918
import lombok.NoArgsConstructor;
2019

2120

22-
23-
@Data
21+
@Getter
2422
@NoArgsConstructor
2523
@AllArgsConstructor
2624
@Builder
@@ -44,7 +42,6 @@ public class BlockEntity {
4442
@OneToOne(fetch = FetchType.LAZY)
4543
@JoinColumn(name = "prev_hash",
4644
foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT, name = "none"))
47-
@EqualsAndHashCode.Exclude
4845
private BlockEntity prev;
4946

5047
@OneToMany(fetch = FetchType.LAZY, mappedBy = "block")

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/DelegationEntity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@
66
import jakarta.persistence.IdClass;
77
import jakarta.persistence.Table;
88

9-
import lombok.AllArgsConstructor;
10-
import lombok.Data;
9+
import lombok.Getter;
1110
import lombok.NoArgsConstructor;
12-
import lombok.experimental.SuperBuilder;
1311

14-
@Data
12+
@Getter
1513
@NoArgsConstructor
16-
@AllArgsConstructor
17-
@SuperBuilder
1814
@Entity
1915
@Table(name = "delegation")
2016
@IdClass(DelegationId.class)

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/DelegationId.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package org.cardanofoundation.rosetta.api.block.model.entity;
22

33
import java.io.Serializable;
4-
import jakarta.persistence.Column;
54

65
import lombok.EqualsAndHashCode;
76

87
@EqualsAndHashCode
98
public class DelegationId implements Serializable {
109

11-
@Column(name = "tx_hash")
1210
private String txHash;
13-
@Column(name = "cert_index")
1411
private long certIndex;
1512
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/EpochParamEntity.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,20 @@
33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;
55
import jakarta.persistence.Id;
6-
import jakarta.persistence.PrePersist;
76
import jakarta.persistence.Table;
87

98
import lombok.AllArgsConstructor;
10-
import lombok.Data;
9+
import lombok.Getter;
1110
import lombok.NoArgsConstructor;
12-
import lombok.experimental.SuperBuilder;
13-
import lombok.extern.slf4j.Slf4j;
1411

1512
import io.hypersistence.utils.hibernate.type.json.JsonType;
1613
import org.hibernate.annotations.Type;
1714

18-
19-
@Data
20-
@NoArgsConstructor
15+
@Getter
2116
@AllArgsConstructor
22-
@SuperBuilder
17+
@NoArgsConstructor
2318
@Entity
2419
@Table(name = "epoch_param")
25-
@Slf4j
2620
public class EpochParamEntity {
2721

2822
@Id
@@ -33,15 +27,4 @@ public class EpochParamEntity {
3327
@Column(name = "params", columnDefinition = "json")
3428
private ProtocolParamsEntity params;
3529

36-
@PrePersist
37-
public void preSave() {
38-
if (this.getParams() == null) {
39-
return;
40-
}
41-
42-
//reset these fields
43-
if (this.getParams().getCostModels() != null) {
44-
this.getParams().setCostModels(null);
45-
}
46-
}
4730
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/PoolRegistrationEntity.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,18 @@
99
import jakarta.persistence.IdClass;
1010
import jakarta.persistence.Table;
1111

12-
import lombok.AllArgsConstructor;
13-
import lombok.Data;
12+
import lombok.Getter;
1413
import lombok.NoArgsConstructor;
15-
import lombok.experimental.SuperBuilder;
1614

1715
import com.bloxbean.cardano.yaci.core.model.Relay;
1816
import io.hypersistence.utils.hibernate.type.json.JsonType;
19-
import org.hibernate.annotations.DynamicUpdate;
2017
import org.hibernate.annotations.Type;
2118

22-
@Data
19+
@Getter
2320
@NoArgsConstructor
24-
@AllArgsConstructor
25-
@SuperBuilder
2621
@Entity
2722
@Table(name = "pool_registration")
2823
@IdClass(PoolRegistrationId.class)
29-
@DynamicUpdate
3024
public class PoolRegistrationEntity {
3125

3226
@Id

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/PoolRegistrationId.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package org.cardanofoundation.rosetta.api.block.model.entity;
22

33
import java.io.Serializable;
4-
import jakarta.persistence.Column;
54

65
import lombok.EqualsAndHashCode;
76

87
@EqualsAndHashCode
98
public class PoolRegistrationId implements Serializable {
109

11-
@Column(name = "tx_hash")
1210
private String txHash;
13-
14-
@Column(name = "cert_index")
1511
private int certIndex;
1612
}

0 commit comments

Comments
 (0)