From 6c78081607077fb355c2455f03c54c6ac96e6210 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 11 May 2023 14:51:35 +0300
Subject: [PATCH] extract abstract class ExecutionCommon

---
 .../data/execution/ExecutionCommon.java       | 191 ++++++++++++++++
 .../data/execution/ExecutionDeposit.java      | 187 +--------------
 .../statics/data/execution/ExecutionFond.java | 213 ++----------------
 3 files changed, 210 insertions(+), 381 deletions(-)
 create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java

diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java
new file mode 100644
index 000000000..00793129d
--- /dev/null
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java
@@ -0,0 +1,191 @@
+package ru.clearing.classes.statics.data.execution;
+
+import ru.clearing.classes.objects.BusinessObject;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+
+public abstract class ExecutionCommon extends BusinessObject {
+    protected Long exchangeExecutionId;
+    protected Instant exchangeExecutionTime;
+    protected LocalDate tradingDate;
+    protected Long tradingClearingRegistryId;
+    protected String market;
+    protected BigDecimal price;
+    protected BigDecimal lots;
+    protected BigDecimal quantity;
+    protected BigDecimal interestAmount;
+    protected String side;
+    protected String settlementCurrency;
+    protected Long companyId;
+    protected Long duration;
+    protected String securityFullName;
+    protected String securitySymbol;
+    protected Long securityId;
+    protected Long counterPartyId;
+    protected String coverageStatus;
+    protected Long sessionId;
+    protected LocalDate clearingDate;
+
+    public LocalDate getClearingDate() {
+        return clearingDate;
+    }
+
+    public void setClearingDate(LocalDate value) {
+        this.clearingDate = value;
+    }
+
+    public Long getExchangeExecutionId() {
+        return exchangeExecutionId;
+    }
+
+    public void setExchangeExecutionId(Long value) {
+        this.exchangeExecutionId = value;
+    }
+
+    public String getSide() {
+        return side;
+    }
+
+    public void setSide(String value) {
+        this.side = value;
+    }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String value) {
+        this.market = value;
+    }
+
+    public LocalDate getTradingDate() {
+        return tradingDate;
+    }
+
+    public void setTradingDate(LocalDate value) {
+        this.tradingDate = value;
+    }
+
+    public String getSecuritySymbol() {
+        return securitySymbol;
+    }
+
+    public void setSecuritySymbol(String value) {
+        this.securitySymbol = value;
+    }
+
+    public Long getSecurityId() {
+        return securityId;
+    }
+
+    public void setSecurityId(Long value) {
+        this.securityId = value;
+    }
+
+    public BigDecimal getInterestAmount() {
+        return interestAmount;
+    }
+
+    public void setInterestAmount(BigDecimal value) {
+        this.interestAmount = value;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal value) {
+        this.price = value;
+    }
+
+    public BigDecimal getLots() {
+        return lots;
+    }
+
+    public void setLots(BigDecimal value) {
+        this.lots = value;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal value) {
+        this.quantity = value;
+    }
+
+    public Instant getExchangeExecutionTime() {
+        return exchangeExecutionTime;
+    }
+
+    public void setExchangeExecutionTime(Instant value) {
+        this.exchangeExecutionTime = value;
+    }
+
+    public Long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Long value) {
+        this.duration = value;
+    }
+
+    public Long getTradingClearingRegistryId() {
+        return tradingClearingRegistryId;
+    }
+
+    public void setTradingClearingRegistryId(Long value) {
+        this.tradingClearingRegistryId = value;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long value) {
+        this.companyId = value;
+    }
+
+    public Long getCounterPartyId() {
+        return counterPartyId;
+    }
+
+    public void setCounterPartyId(Long value) {
+        this.counterPartyId = value;
+    }
+
+    public String getSecurityFullName() {
+        return securityFullName;
+    }
+
+    public void setSecurityFullName(String value) {
+        this.securityFullName = value;
+    }
+
+    public String getSettlementCurrency() {
+        return settlementCurrency;
+    }
+
+    public void setSettlementCurrency(String value) {
+        this.settlementCurrency = value;
+    }
+
+    public String getCoverageStatus() {
+        return coverageStatus;
+    }
+
+    public void setCoverageStatus(String value) {
+        this.coverageStatus = value;
+    }
+
+    public Long getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(Long value) {
+        this.sessionId = value;
+    }
+
+}
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java
index 0d80e74c0..3883d4507 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java
@@ -1,103 +1,20 @@
 package ru.clearing.classes.statics.data.execution;
 
-import ru.clearing.classes.objects.BusinessObject;
+import ru.clearing.classes.ConstSerializable;
 
 import java.math.BigDecimal;
-import java.time.Instant;
 import java.time.LocalDate;
 
-public class ExecutionDeposit extends BusinessObject {
-    private Long exchangeExecutionId;
-    private Instant exchangeExecutionTime;
-    private LocalDate tradingDate;
-    private Long tradingClearingRegistryId;
-    private String market;
-    private BigDecimal price;
-    private BigDecimal lots;
-    private BigDecimal quantity;
+public class ExecutionDeposit extends ExecutionCommon {
+    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
     private BigDecimal firstLegAmount;
     private BigDecimal secondLegAmount;
-    private BigDecimal interestAmount;
-    private String side;
-    private String settlementCurrency;
-    private Long companyId;
-    private Long duration;
     private LocalDate firstLegSettlementDate;
     private LocalDate secondLegSettlementDate;
     private String firstLegSettlementCode;
     private String secondLegSettlementCode;
-    private String securityFullName;
-    private String securitySymbol;
-    private Long securityId;
     private String contract;
-    private Long counterPartyId;
-    private String coverageStatus;
-    private Long sessionId;
-    private LocalDate clearingDate;
-
-    public Long getExchangeExecutionId() {
-        return exchangeExecutionId;
-    }
-
-    public void setExchangeExecutionId(Long exchangeExecutionId) {
-        this.exchangeExecutionId = exchangeExecutionId;
-    }
-
-    public Instant getExchangeExecutionTime() {
-        return exchangeExecutionTime;
-    }
-
-    public void setExchangeExecutionTime(Instant exchangeExecutionTime) {
-        this.exchangeExecutionTime = exchangeExecutionTime;
-    }
-
-    public LocalDate getTradingDate() {
-        return tradingDate;
-    }
-
-    public void setTradingDate(LocalDate tradingDate) {
-        this.tradingDate = tradingDate;
-    }
-
-    public Long getTradingClearingRegistryId() {
-        return tradingClearingRegistryId;
-    }
-
-    public void setTradingClearingRegistryId(Long tradingClearingRegistryId) {
-        this.tradingClearingRegistryId = tradingClearingRegistryId;
-    }
-
-    public String getMarket() {
-        return market;
-    }
-
-    public void setMarket(String market) {
-        this.market = market;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public BigDecimal getLots() {
-        return lots;
-    }
-
-    public void setLots(BigDecimal lots) {
-        this.lots = lots;
-    }
-
-    public BigDecimal getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(BigDecimal quantity) {
-        this.quantity = quantity;
-    }
 
     public BigDecimal getFirstLegAmount() {
         return firstLegAmount;
@@ -115,46 +32,6 @@ public class ExecutionDeposit extends BusinessObject {
         this.secondLegAmount = secondLegAmount;
     }
 
-    public BigDecimal getInterestAmount() {
-        return interestAmount;
-    }
-
-    public void setInterestAmount(BigDecimal interestAmount) {
-        this.interestAmount = interestAmount;
-    }
-
-    public String getSide() {
-        return side;
-    }
-
-    public void setSide(String side) {
-        this.side = side;
-    }
-
-    public String getSettlementCurrency() {
-        return settlementCurrency;
-    }
-
-    public void setSettlementCurrency(String settlementCurrency) {
-        this.settlementCurrency = settlementCurrency;
-    }
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
-    }
-
-    public Long getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-
     public LocalDate getFirstLegSettlementDate() {
         return firstLegSettlementDate;
     }
@@ -187,30 +64,6 @@ public class ExecutionDeposit extends BusinessObject {
         this.secondLegSettlementCode = secondLegSettlementCode;
     }
 
-    public String getSecurityFullName() {
-        return securityFullName;
-    }
-
-    public void setSecurityFullName(String securityFullName) {
-        this.securityFullName = securityFullName;
-    }
-
-    public String getSecuritySymbol() {
-        return securitySymbol;
-    }
-
-    public void setSecuritySymbol(String securitySymbol) {
-        this.securitySymbol = securitySymbol;
-    }
-
-    public Long getSecurityId() {
-        return securityId;
-    }
-
-    public void setSecurityId(Long securityId) {
-        this.securityId = securityId;
-    }
-
     public String getContract() {
         return contract;
     }
@@ -218,36 +71,4 @@ public class ExecutionDeposit extends BusinessObject {
     public void setContract(String contract) {
         this.contract = contract;
     }
-
-    public Long getCounterPartyId() {
-        return counterPartyId;
-    }
-
-    public void setCounterPartyId(Long counterPartyId) {
-        this.counterPartyId = counterPartyId;
-    }
-
-    public String getCoverageStatus() {
-        return coverageStatus;
-    }
-
-    public void setCoverageStatus(String coverageStatus) {
-        this.coverageStatus = coverageStatus;
-    }
-
-    public Long getSessionId() {
-        return sessionId;
-    }
-
-    public void setSessionId(Long sessionId) {
-        this.sessionId = sessionId;
-    }
-
-    public LocalDate getClearingDate() {
-        return clearingDate;
-    }
-
-    public void setClearingDate(LocalDate clearingDate) {
-        this.clearingDate = clearingDate;
-    }
 }
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionFond.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionFond.java
index 8cc9e76f9..ef7421f4e 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionFond.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionFond.java
@@ -1,7 +1,6 @@
 package ru.clearing.classes.statics.data.execution;
 
 import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessObject;
 
 import java.math.BigDecimal;
 import java.time.Instant;
@@ -12,252 +11,70 @@ import java.time.LocalDate;
  * <p>
  * DB table: EXECUTION_FOND
  **/
-public class ExecutionFond extends BusinessObject {
+public class ExecutionFond extends ExecutionCommon {
     private static final long serialVersionUID = ConstSerializable.serialVersionUID;
 
-    private LocalDate clearingDate;
-    private Long exchangeExecutionId;
-    private String side;
-    private String market;
-    private LocalDate tradingDate;
-    private String securitySymbol;
-    private Long securityId;
-    private BigDecimal interestAmount;
     private Long exchangeOrderId;
-    private BigDecimal price;
     private BigDecimal settlementAmount;
-    private BigDecimal lots;
-    private BigDecimal quantity;
-    private Instant exchangeExecutionTime;
-    private Long duration;
-    private Long tradingClearingRegistryId;
     private String comment;
     private Long clientCodeId;
     private String settlementCode;
-    private Long companyId;
-    private Long counterPartyId;
-    private String securityFullName;
     private LocalDate settlementDate;
-    private String settlementCurrency;
     private Instant exchangeExecutionMicroseconds;
-    private String coverageStatus;
-    private Long sessionId;
-
-
-    public LocalDate getClearingDate() {
-        return clearingDate;
-    }
-
-    public void setClearingDate(LocalDate value) {
-        this.clearingDate = value;
-    }
-
-    public Long getExchangeExecutionId() {
-        return exchangeExecutionId;
-    }
-
-    public void setExchangeExecutionId(Long value) {
-        this.exchangeExecutionId = value;
-    }
-
-    public String getSide() {
-        return side;
-    }
-
-    public void setSide(String value) {
-        this.side = value;
-    }
-
-    public String getMarket() {
-        return market;
-    }
-
-    public void setMarket(String value) {
-        this.market = value;
-    }
-
-    public LocalDate getTradingDate() {
-        return tradingDate;
-    }
-
-    public void setTradingDate(LocalDate value) {
-        this.tradingDate = value;
-    }
-
-    public String getSecuritySymbol() {
-        return securitySymbol;
-    }
-
-    public void setSecuritySymbol(String value) {
-        this.securitySymbol = value;
-    }
-
-    public Long getSecurityId() {
-        return securityId;
-    }
-
-    public void setSecurityId(Long value) {
-        this.securityId = value;
-    }
-
-    public BigDecimal getInterestAmount() {
-        return interestAmount;
-    }
-
-    public void setInterestAmount(BigDecimal value) {
-        this.interestAmount = value;
-    }
 
     public Long getExchangeOrderId() {
         return exchangeOrderId;
     }
 
-    public void setExchangeOrderId(Long value) {
-        this.exchangeOrderId = value;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal value) {
-        this.price = value;
+    public void setExchangeOrderId(Long exchangeOrderId) {
+        this.exchangeOrderId = exchangeOrderId;
     }
 
     public BigDecimal getSettlementAmount() {
         return settlementAmount;
     }
 
-    public void setSettlementAmount(BigDecimal value) {
-        this.settlementAmount = value;
-    }
-
-    public BigDecimal getLots() {
-        return lots;
-    }
-
-    public void setLots(BigDecimal value) {
-        this.lots = value;
-    }
-
-    public BigDecimal getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(BigDecimal value) {
-        this.quantity = value;
-    }
-
-    public Instant getExchangeExecutionTime() {
-        return exchangeExecutionTime;
-    }
-
-    public void setExchangeExecutionTime(Instant value) {
-        this.exchangeExecutionTime = value;
-    }
-
-    public Long getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Long value) {
-        this.duration = value;
-    }
-
-    public Long getTradingClearingRegistryId() {
-        return tradingClearingRegistryId;
-    }
-
-    public void setTradingClearingRegistryId(Long value) {
-        this.tradingClearingRegistryId = value;
+    public void setSettlementAmount(BigDecimal settlementAmount) {
+        this.settlementAmount = settlementAmount;
     }
 
     public String getComment() {
         return comment;
     }
 
-    public void setComment(String value) {
-        this.comment = value;
+    public void setComment(String comment) {
+        this.comment = comment;
     }
 
     public Long getClientCodeId() {
         return clientCodeId;
     }
 
-    public void setClientCodeId(Long value) {
-        this.clientCodeId = value;
+    public void setClientCodeId(Long clientCodeId) {
+        this.clientCodeId = clientCodeId;
     }
 
     public String getSettlementCode() {
         return settlementCode;
     }
 
-    public void setSettlementCode(String value) {
-        this.settlementCode = value;
-    }
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long value) {
-        this.companyId = value;
-    }
-
-    public Long getCounterPartyId() {
-        return counterPartyId;
-    }
-
-    public void setCounterPartyId(Long value) {
-        this.counterPartyId = value;
-    }
-
-    public String getSecurityFullName() {
-        return securityFullName;
-    }
-
-    public void setSecurityFullName(String value) {
-        this.securityFullName = value;
+    public void setSettlementCode(String settlementCode) {
+        this.settlementCode = settlementCode;
     }
 
     public LocalDate getSettlementDate() {
         return settlementDate;
     }
 
-    public void setSettlementDate(LocalDate value) {
-        this.settlementDate = value;
-    }
-
-    public String getSettlementCurrency() {
-        return settlementCurrency;
-    }
-
-    public void setSettlementCurrency(String value) {
-        this.settlementCurrency = value;
+    public void setSettlementDate(LocalDate settlementDate) {
+        this.settlementDate = settlementDate;
     }
 
     public Instant getExchangeExecutionMicroseconds() {
         return exchangeExecutionMicroseconds;
     }
 
-    public void setExchangeExecutionMicroseconds(Instant value) {
-        this.exchangeExecutionMicroseconds = value;
+    public void setExchangeExecutionMicroseconds(Instant exchangeExecutionMicroseconds) {
+        this.exchangeExecutionMicroseconds = exchangeExecutionMicroseconds;
     }
-
-    public String getCoverageStatus() {
-        return coverageStatus;
-    }
-
-    public void setCoverageStatus(String value) {
-        this.coverageStatus = value;
-    }
-
-    public Long getSessionId() {
-        return sessionId;
-    }
-
-    public void setSessionId(Long value) {
-        this.sessionId = value;
-    }
-
 }
\ No newline at end of file