diff --git a/build.gradle b/build.gradle index 817be26e..fbb48e57 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,8 @@ dependencies { testImplementation 'junit:junit:4.13' implementation 'com.amazonaws:aws-java-sdk:1.11.486' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.0' + compileOnly 'org.projectlombok:lombok:1.18.12' + annotationProcessor 'org.projectlombok:lombok:1.18.12' } group = 'hu.dpc.phee' diff --git a/src/main/java/hu/dpc/phee/operator/entity/batch/Batch.java b/src/main/java/hu/dpc/phee/operator/entity/batch/Batch.java index b613a4ef..ce04ad75 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/batch/Batch.java +++ b/src/main/java/hu/dpc/phee/operator/entity/batch/Batch.java @@ -1,18 +1,22 @@ package hu.dpc.phee.operator.entity.batch; import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.eclipse.persistence.annotations.Index; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.Table; import java.util.Date; @Entity @Table(name = "batches") +@Getter +@Setter +@NoArgsConstructor public class Batch extends AbstractPersistableCustom { - @Column(name = "BATCH_ID") private String batchId; @@ -74,170 +78,7 @@ public class Batch extends AbstractPersistableCustom { @Column(name = "PAYMENT_MODE") private String paymentMode; - public Batch() { - } - public Batch(Long workflowInstanceKey) { this.workflowInstanceKey = workflowInstanceKey; } - - public String getBatchId() { - return batchId; - } - - public void setBatchId(String batchId) { - this.batchId = batchId; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getRequestFile() { - return requestFile; - } - - public void setRequestFile(String requestFile) { - this.requestFile = requestFile; - } - - public Long getTotalTransactions() { - return totalTransactions; - } - - public void setTotalTransactions(Long totalTransactions) { - this.totalTransactions = totalTransactions; - } - - public Long getOngoing() { - return ongoing; - } - - public void setOngoing(Long ongoing) { - this.ongoing = ongoing; - } - - public Long getFailed() { - return failed; - } - - public void setFailed(Long failed) { - this.failed = failed; - } - - public Long getCompleted() { - return completed; - } - - public void setCompleted(Long completed) { - this.completed = completed; - } - - public String getResult_file() { - return result_file; - } - - public void setResult_file(String result_file) { - this.result_file = result_file; - } - - public Date getResultGeneratedAt() { - return resultGeneratedAt; - } - - public void setResultGeneratedAt(Date resultGeneratedAt) { - this.resultGeneratedAt = resultGeneratedAt; - } - - public String getNote() { - return note; - } - - public void setNote(String note) { - this.note = note; - } - - public Long getWorkflowKey() { - return workflowKey; - } - - public void setWorkflowKey(Long workflowKey) { - this.workflowKey = workflowKey; - } - - public Long getWorkflowInstanceKey() { - return workflowInstanceKey; - } - - public void setWorkflowInstanceKey(Long workflowInstanceKey) { - this.workflowInstanceKey = workflowInstanceKey; - } - - public Date getStartedAt() { - return startedAt; - } - - public void setStartedAt(Date startedAt) { - this.startedAt = startedAt; - } - - public Date getCompletedAt() { - return completedAt; - } - - public void setCompletedAt(Date completedAt) { - this.completedAt = completedAt; - } - - public String getSubBatchId() { - return subBatchId; - } - - public void setSubBatchId(String subBatchId) { - this.subBatchId = subBatchId; - } - - public Long getTotalAmount() { - return totalAmount; - } - - public void setTotalAmount(Long totalAmount) { - this.totalAmount = totalAmount; - } - - public Long getOngoingAmount() { - return ongoingAmount; - } - - public void setOngoingAmount(Long ongoingAmount) { - this.ongoingAmount = ongoingAmount; - } - - public Long getFailedAmount() { - return failedAmount; - } - - public void setFailedAmount(Long failedAmount) { - this.failedAmount = failedAmount; - } - - public Long getCompletedAmount() { - return completedAmount; - } - - public void setCompletedAmount(Long completedAmount) { - this.completedAmount = completedAmount; - } - - public String getPaymentMode() { - return paymentMode; - } - - public void setPaymentMode(String mode) { - this.paymentMode = mode; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/batch/BatchRepository.java b/src/main/java/hu/dpc/phee/operator/entity/batch/BatchRepository.java index ceb1b834..63026fd5 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/batch/BatchRepository.java +++ b/src/main/java/hu/dpc/phee/operator/entity/batch/BatchRepository.java @@ -2,7 +2,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.repository.CrudRepository; public interface BatchRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/src/main/java/hu/dpc/phee/operator/entity/batch/Transaction.java b/src/main/java/hu/dpc/phee/operator/entity/batch/Transaction.java index 7618abe6..dadf5121 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/batch/Transaction.java +++ b/src/main/java/hu/dpc/phee/operator/entity/batch/Transaction.java @@ -4,9 +4,15 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; @JsonIgnoreProperties(ignoreUnknown = true) @JsonPropertyOrder({ "id", "request_id", "payment_mode", "account_number", "payer_identifier_type", "payer_identifier", "payee_identifier_type", "payee_identifier", "amount", "currency", "note", "program_shortcode", "cycle" }) +@Getter +@Setter +@ToString public class Transaction implements CsvSchema { @JsonProperty("id") @@ -54,142 +60,6 @@ public class Transaction implements CsvSchema { @JsonIgnore private String status; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getPaymentMode() { - return paymentMode; - } - - public void setPaymentMode(String paymentMode) { - this.paymentMode = paymentMode; - } - - public String getAccountNumber() { - return accountNumber; - } - - public void setAccountNumber(String accountNumber) { - this.accountNumber = accountNumber; - } - - public String getAmount() { - return amount; - } - - public void setAmount(String amount) { - this.amount = amount; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - public String getNote() { - return note; - } - - public void setNote(String note) { - this.note = note; - } - - public String getBatchId() { - return batchId; - } - - public void setBatchId(String batchId) { - this.batchId = batchId; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getPayerIdentifierType() { - return payerIdentifierType; - } - - public void setPayerIdentifierType(String payerIdentifierType) { - this.payerIdentifierType = payerIdentifierType; - } - - public String getPayerIdentifier() { - return payerIdentifier; - } - - public void setPayerIdentifier(String payerIdentifier) { - this.payerIdentifier = payerIdentifier; - } - - public String getPayeeIdentifierType() { - return payeeIdentifierType; - } - - public void setPayeeIdentifierType(String payeeIdentifierType) { - this.payeeIdentifierType = payeeIdentifierType; - } - - public String getPayeeIdentifier() { - return payeeIdentifier; - } - - public void setPayeeIdentifier(String payeeIdentifier) { - this.payeeIdentifier = payeeIdentifier; - } - - public String getProgramShortCode() { - return programShortCode; - } - - public void setProgramShortCode(String programShortCode) { - this.programShortCode = programShortCode; - } - - public String getCycle() { - return cycle; - } - - public void setCycle(String cycle) { - this.cycle = cycle; - } - - @Override - public String toString() { - return "Transaction{" + - "id=" + id + - ", request_id='" + requestId + '\'' + - ", payment_mode='" + paymentMode + '\'' + - ", account_number='" + accountNumber + '\'' + - ", amount='" + amount + '\'' + - ", currency='" + currency + '\'' + - ", note='" + note + '\'' + - ", batchId='" + batchId + '\'' + - ", status='" + status + '\'' + - '}'; - } - @JsonIgnore @Override public String getCsvString() { diff --git a/src/main/java/hu/dpc/phee/operator/entity/businesskey/BusinessKey.java b/src/main/java/hu/dpc/phee/operator/entity/businesskey/BusinessKey.java index c813f7b5..028acac5 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/businesskey/BusinessKey.java +++ b/src/main/java/hu/dpc/phee/operator/entity/businesskey/BusinessKey.java @@ -2,6 +2,8 @@ import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.Setter; import org.eclipse.persistence.annotations.Index; import javax.persistence.Column; @@ -10,6 +12,8 @@ @Entity @Table(name = "businesskeys") +@Getter +@Setter public class BusinessKey extends AbstractPersistableCustom { @Column(name = "BUSINESS_KEY") @@ -26,36 +30,4 @@ public class BusinessKey extends AbstractPersistableCustom { @Column(name = "TIMESTAMP") private Long timestamp; - - public String getBusinessKeyType() { - return businessKeyType; - } - - public void setBusinessKeyType(String businessKeyType) { - this.businessKeyType = businessKeyType; - } - - public Long getWorkflowInstanceKey() { - return workflowInstanceKey; - } - - public void setWorkflowInstanceKey(Long workflowInstanceKey) { - this.workflowInstanceKey = workflowInstanceKey; - } - - public Long getTimestamp() { - return timestamp; - } - - public void setTimestamp(Long timestamp) { - this.timestamp = timestamp; - } - - public String getBusinessKey() { - return businessKey; - } - - public void setBusinessKey(String transactionId) { - this.businessKey = transactionId; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/parent/AbstractPersistableCustom.java b/src/main/java/hu/dpc/phee/operator/entity/parent/AbstractPersistableCustom.java index 629b2435..fca8d49f 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/parent/AbstractPersistableCustom.java +++ b/src/main/java/hu/dpc/phee/operator/entity/parent/AbstractPersistableCustom.java @@ -19,6 +19,7 @@ package hu.dpc.phee.operator.entity.parent; import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Setter; import org.springframework.data.domain.Persistable; import javax.persistence.GeneratedValue; @@ -29,6 +30,7 @@ @MappedSuperclass +@Setter public abstract class AbstractPersistableCustom implements Persistable { @Id @@ -40,11 +42,6 @@ public Long getId() { return id; } - public void setId(final Long id) { - - this.id = id; - } - @Override @JsonIgnore public boolean isNew() { diff --git a/src/main/java/hu/dpc/phee/operator/entity/task/Task.java b/src/main/java/hu/dpc/phee/operator/entity/task/Task.java index d09a9cf3..05cba993 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/task/Task.java +++ b/src/main/java/hu/dpc/phee/operator/entity/task/Task.java @@ -2,16 +2,18 @@ import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.Setter; -import javax.persistence.Cacheable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @Entity @Table(name = "tasks") +@Getter +@Setter public class Task extends AbstractPersistableCustom { - @Column(name = "WORKFLOW_KEY") private Long workflowKey; @Column(name = "WORKFLOW_INSTANCE_KEY") @@ -26,60 +28,4 @@ public class Task extends AbstractPersistableCustom { private String type; @Column(name = "ELEMENT_ID") private String elementId; - - public Long getTimestamp() { - return timestamp; - } - - public void setTimestamp(Long timestamp) { - this.timestamp = timestamp; - } - - public Long getWorkflowKey() { - return workflowKey; - } - - public void setWorkflowKey(Long workflowKey) { - this.workflowKey = workflowKey; - } - - public Long getWorkflowInstanceKey() { - return workflowInstanceKey; - } - - public void setWorkflowInstanceKey(Long workflowInstanceKey) { - this.workflowInstanceKey = workflowInstanceKey; - } - - public String getIntent() { - return intent; - } - - public void setIntent(String intent) { - this.intent = intent; - } - - public String getRecordType() { - return recordType; - } - - public void setRecordType(String recordType) { - this.recordType = recordType; - } - - public String getType() { - return type; - } - - public String getElementId() { - return elementId; - } - - public void setElementId(String elementId) { - this.elementId = elementId; - } - - public void setType(String type) { - this.type = type; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/tenant/TenantServerConnection.java b/src/main/java/hu/dpc/phee/operator/entity/tenant/TenantServerConnection.java index b5d0050b..690bb22f 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/tenant/TenantServerConnection.java +++ b/src/main/java/hu/dpc/phee/operator/entity/tenant/TenantServerConnection.java @@ -21,6 +21,9 @@ import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,6 +31,9 @@ @Entity @Table(name = "tenant_server_connections") +@ToString +@Getter +@Setter public class TenantServerConnection extends AbstractPersistableCustom { @Column(name = "schema_server") @@ -48,65 +54,5 @@ public class TenantServerConnection extends AbstractPersistableCustom { @Column(name = "auto_update") private boolean autoUpdateEnabled; - @Override - public String toString() { - return "TenantServerConnection{" + - "schemaServer='" + schemaServer + '\'' + - ", schemaName='" + schemaName + '\'' + - ", schemaServerPort='" + schemaServerPort + '\'' + - ", schemaUsername='" + schemaUsername + '\'' + - ", schemaPassword='" + schemaPassword + '\'' + - ", autoUpdateEnabled=" + autoUpdateEnabled + - '}'; - } - public TenantServerConnection() {} - - public String getSchemaServer() { - return schemaServer; - } - - public void setSchemaServer(String schemaServer) { - this.schemaServer = schemaServer; - } - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getSchemaServerPort() { - return schemaServerPort; - } - - public void setSchemaServerPort(String schemaServerPort) { - this.schemaServerPort = schemaServerPort; - } - - public String getSchemaUsername() { - return schemaUsername; - } - - public void setSchemaUsername(String schemaUsername) { - this.schemaUsername = schemaUsername; - } - - public String getSchemaPassword() { - return schemaPassword; - } - - public void setSchemaPassword(String schemaPassword) { - this.schemaPassword = schemaPassword; - } - - public boolean isAutoUpdateEnabled() { - return autoUpdateEnabled; - } - - public void setAutoUpdateEnabled(boolean autoUpdateEnabled) { - this.autoUpdateEnabled = autoUpdateEnabled; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/transactionrequest/TransactionRequest.java b/src/main/java/hu/dpc/phee/operator/entity/transactionrequest/TransactionRequest.java index 52707205..e277f146 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/transactionrequest/TransactionRequest.java +++ b/src/main/java/hu/dpc/phee/operator/entity/transactionrequest/TransactionRequest.java @@ -2,12 +2,10 @@ import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Table; +import javax.persistence.*; import java.math.BigDecimal; import java.util.Date; @@ -15,6 +13,8 @@ @Entity @Table(name = "transaction_requests") +@Getter +@Setter public class TransactionRequest extends AbstractPersistableCustom { @Column(name = "WORKFLOW_INSTANCE_KEY") @@ -85,200 +85,8 @@ public class TransactionRequest extends AbstractPersistableCustom { public TransactionRequest() { } - public String getExternalId() { - return externalId; - } - - public void setExternalId(String externalId) { - this.externalId = externalId; - } - public TransactionRequest(Long workflowInstanceKey) { this.workflowInstanceKey = workflowInstanceKey; this.state = IN_PROGRESS; } - - public Long getWorkflowInstanceKey() { - return workflowInstanceKey; - } - - public void setWorkflowInstanceKey(Long workflowInstanceKey) { - this.workflowInstanceKey = workflowInstanceKey; - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - public Date getStartedAt() { - return startedAt; - } - - public void setStartedAt(Date startedAt) { - this.startedAt = startedAt; - } - - public Date getCompletedAt() { - return completedAt; - } - - public void setCompletedAt(Date completedAt) { - this.completedAt = completedAt; - } - - public TransactionRequestState getState() { - return state; - } - - public void setState(TransactionRequestState state) { - this.state = state; - } - - public String getPayeeDfspId() { - return payeeDfspId; - } - - public void setPayeeDfspId(String payeeDfspId) { - this.payeeDfspId = payeeDfspId; - } - - public String getPayeePartyId() { - return payeePartyId; - } - - public void setPayeePartyId(String payeePartyId) { - this.payeePartyId = payeePartyId; - } - - public String getPayeePartyIdType() { - return payeePartyIdType; - } - - public void setPayeePartyIdType(String payeePartyIdType) { - this.payeePartyIdType = payeePartyIdType; - } - - public BigDecimal getPayeeFee() { - return payeeFee; - } - - public void setPayeeFee(BigDecimal payeeFee) { - this.payeeFee = payeeFee; - } - - public String getPayeeQuoteCode() { - return payeeQuoteCode; - } - - public void setPayeeQuoteCode(String payeeQuoteCode) { - this.payeeQuoteCode = payeeQuoteCode; - } - - public String getPayerDfspId() { - return payerDfspId; - } - - public void setPayerDfspId(String payerDfspId) { - this.payerDfspId = payerDfspId; - } - - public String getPayerPartyId() { - return payerPartyId; - } - - public void setPayerPartyId(String payerPartyId) { - this.payerPartyId = payerPartyId; - } - - public String getPayerPartyIdType() { - return payerPartyIdType; - } - - public void setPayerPartyIdType(String payerPartyIdType) { - this.payerPartyIdType = payerPartyIdType; - } - - public BigDecimal getPayerFee() { - return payerFee; - } - - public void setPayerFee(BigDecimal payerFee) { - this.payerFee = payerFee; - } - - public String getPayerQuoteCode() { - return payerQuoteCode; - } - - public void setPayerQuoteCode(String payerQuoteCode) { - this.payerQuoteCode = payerQuoteCode; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getAuthType() { - return authType; - } - - public void setAuthType(String authType) { - this.authType = authType; - } - - public String getInitiatorType() { - return initiatorType; - } - - public void setInitiatorType(String initiatorType) { - this.initiatorType = initiatorType; - } - - public String getScenario() { - return scenario; - } - - public void setScenario(String scenario) { - this.scenario = scenario; - } - - public void setClientCorrelationId(String clientCorrelationId) { - this.clientCorrelationId = clientCorrelationId; - } - - public String getClientCorrelationId() { - return clientCorrelationId; - } - - public String getErrorInformation() { - return errorInformation; - } - - public void setErrorInformation(String errorInformation) { - this.errorInformation = errorInformation; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/transfer/Transfer.java b/src/main/java/hu/dpc/phee/operator/entity/transfer/Transfer.java index f0526f4d..b8d5cf61 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/transfer/Transfer.java +++ b/src/main/java/hu/dpc/phee/operator/entity/transfer/Transfer.java @@ -2,17 +2,19 @@ import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Table; +import javax.persistence.*; import java.math.BigDecimal; import java.util.Date; @Entity @Table(name = "transfers") +@Getter +@Setter +@NoArgsConstructor public class Transfer extends AbstractPersistableCustom { @Column(name = "WORKFLOW_INSTANCE_KEY") @@ -77,203 +79,8 @@ public class Transfer extends AbstractPersistableCustom { private String clientCorrelationId; - public Transfer() { - } - public Transfer(Long workflowInstanceKey) { this.workflowInstanceKey = workflowInstanceKey; this.status = TransferStatus.IN_PROGRESS; } - - public Date getCompletedAt() { - return completedAt; - } - - public void setCompletedAt(Date completedAt) { - this.completedAt = completedAt; - } - - public Date getStartedAt() { - return startedAt; - } - - public void setStartedAt(Date startedAt) { - this.startedAt = startedAt; - } - - public BigDecimal getPayeeFee() { - return payeeFee; - } - - public void setPayeeFee(BigDecimal payeeFee) { - this.payeeFee = payeeFee; - } - - public String getPayeeQuoteCode() { - return payeeQuoteCode; - } - - public void setPayeeQuoteCode(String payeeQuoteCode) { - this.payeeQuoteCode = payeeQuoteCode; - } - - public BigDecimal getPayerFee() { - return payerFee; - } - - public void setPayerFee(BigDecimal payerFee) { - this.payerFee = payerFee; - } - - public String getPayerQuoteCode() { - return payerQuoteCode; - } - - public void setPayerQuoteCode(String payerQuoteCode) { - this.payerQuoteCode = payerQuoteCode; - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - public Long getWorkflowInstanceKey() { - return workflowInstanceKey; - } - - public void setWorkflowInstanceKey(Long paymentProcessId) { - this.workflowInstanceKey = paymentProcessId; - } - - public TransferStatus getStatus() { - return status; - } - - public void setStatus(TransferStatus status) { - this.status = status; - } - - public String getPayeePartyId() { - return payeePartyId; - } - - public void setPayeePartyId(String payeePartyId) { - this.payeePartyId = payeePartyId; - } - - public String getPayeePartyIdType() { - return payeePartyIdType; - } - - public void setPayeePartyIdType(String payeePartyType) { - this.payeePartyIdType = payeePartyType; - } - - public String getPayerPartyId() { - return payerPartyId; - } - - public void setPayerPartyId(String payerPartyId) { - this.payerPartyId = payerPartyId; - } - - public String getPayerPartyIdType() { - return payerPartyIdType; - } - - public void setPayerPartyIdType(String payerPartyType) { - this.payerPartyIdType = payerPartyType; - } - - public String getPayeeFeeCurrency() { - return payeeFeeCurrency; - } - - public void setPayeeFeeCurrency(String payeeFeeCurrency) { - this.payeeFeeCurrency = payeeFeeCurrency; - } - - public String getPayerFeeCurrency() { - return payerFeeCurrency; - } - - public void setPayerFeeCurrency(String payerFeeCurrency) { - this.payerFeeCurrency = payerFeeCurrency; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public String getPayeeDfspId() { - return payeeDfspId; - } - - public void setPayeeDfspId(String payeeDfspId) { - this.payeeDfspId = payeeDfspId; - } - - public String getPayerDfspId() { - return payerDfspId; - } - - public void setPayerDfspId(String payerDfspId) { - this.payerDfspId = payerDfspId; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - public String getStatusDetail() { - return statusDetail; - } - - public void setStatusDetail(String statusDetail) { - this.statusDetail = statusDetail; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getErrorInformation() { - return errorInformation; - } - - public void setErrorInformation(String errorInformation) { - this.errorInformation = errorInformation; - } - - public String getBatchId() { - return batchId; - } - - public void setBatchId(String batchId) { - this.batchId = batchId; - } - - public String getClientCorrelationId() { - return clientCorrelationId; - } - - public void setClientCorrelationId(String clientCorrelationId) { - this.clientCorrelationId = clientCorrelationId; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/transfer/TransferDetail.java b/src/main/java/hu/dpc/phee/operator/entity/transfer/TransferDetail.java index 5c697764..4cc4e49f 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/transfer/TransferDetail.java +++ b/src/main/java/hu/dpc/phee/operator/entity/transfer/TransferDetail.java @@ -2,42 +2,18 @@ import hu.dpc.phee.operator.entity.task.Task; import hu.dpc.phee.operator.entity.variable.Variable; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; import java.util.List; +@Getter +@Setter +@AllArgsConstructor public class TransferDetail { private Transfer transfer; private List tasks; private List variables; - - public TransferDetail(Transfer transfer, List tasks, List variables) { - this.transfer = transfer; - this.tasks = tasks; - this.variables = variables; - } - - public Transfer getTransfer() { - return transfer; - } - - public void setTransfer(Transfer transfer) { - this.transfer = transfer; - } - - public List getTasks() { - return tasks; - } - - public void setTasks(List tasks) { - this.tasks = tasks; - } - - public List getVariables() { - return variables; - } - - public void setVariables(List variables) { - this.variables = variables; - } } diff --git a/src/main/java/hu/dpc/phee/operator/entity/variable/Variable.java b/src/main/java/hu/dpc/phee/operator/entity/variable/Variable.java index ad0a0569..76744549 100644 --- a/src/main/java/hu/dpc/phee/operator/entity/variable/Variable.java +++ b/src/main/java/hu/dpc/phee/operator/entity/variable/Variable.java @@ -2,17 +2,17 @@ import hu.dpc.phee.operator.entity.parent.AbstractPersistableCustom; +import lombok.Getter; +import lombok.Setter; import org.eclipse.persistence.annotations.Index; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "variables") @Cacheable(false) +@Getter +@Setter public class Variable extends AbstractPersistableCustom { @Column(name = "WORKFLOW_KEY") @@ -31,44 +31,4 @@ public class Variable extends AbstractPersistableCustom { @Lob @Column(name = "VALUE") private String value; - - public Long getWorkflowKey() { - return workflowKey; - } - - public void setWorkflowKey(Long workflowKey) { - this.workflowKey = workflowKey; - } - - public Long getWorkflowInstanceKey() { - return workflowInstanceKey; - } - - public void setWorkflowInstanceKey(Long workflowInstanceKey) { - this.workflowInstanceKey = workflowInstanceKey; - } - - public Long getTimestamp() { - return timestamp; - } - - public void setTimestamp(Long timestamp) { - this.timestamp = timestamp; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } }