Skip to content

PMD failure fix #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lars-xdev wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PMD failure fix #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ...main/java/software/xdev/bzst/dip/client/model/message/cesop/BzstCesopPaymentDataBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package software.xdev.bzst.dip.client.model.message.cesop;

import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.List;

import javax.xml.datatype.DatatypeConfigurationException;
Expand Down Expand Up @@ -72,7 +72,6 @@ public PaymentDataBodyType toXmlType() throws DatatypeConfigurationException
return paymentDataBodyType;
}

@SuppressWarnings("PMD.ReplaceJavaUtilCalendar")
private List<ReportedPayeeType> convertToReportedPayeesType() throws DatatypeConfigurationException
{
final List<ReportedPayeeType> reportedPayeeTypes = new ArrayList<>();
Expand Down Expand Up @@ -142,10 +141,9 @@ private List<ReportedPayeeType> convertToReportedPayeesType() throws DatatypeCon
reportedTransactionType.setInitiatedAtPhysicalPremisesOfMerchant(reportedPayee.reportedTransaction()
.initiatedAtPhysicalPremisesOfMerchant());

final GregorianCalendar gregorianCalendar =
GregorianCalendar.from(reportedPayee.reportedTransaction().transactionDateType().value());
final XMLGregorianCalendar xmlGregorianCalendar =
DatatypeFactory.newInstance().newXMLGregorianCalendar(gregorianCalendar);
final XMLGregorianCalendar xmlGregorianCalendar = DatatypeFactory.newInstance()
.newXMLGregorianCalendar(reportedPayee.reportedTransaction().transactionDateType().value()
.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));

transactionDateType.setValue(xmlGregorianCalendar);
transactionDateType.setTransactionDateType(
Expand Down
21 changes: 10 additions & 11 deletions ...lient/src/main/java/software/xdev/bzst/dip/client/xmldocument/XMLDocumentBodyCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.GregorianCalendar;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -258,33 +258,32 @@ protected static AddressType createAddress(
return addressType;
}

@SuppressWarnings("PMD.ReplaceJavaUtilCalendar")
private software.xdev.bzst.dip.client.xmldocument.model.cesop.MessageSpecType createMessageSpecCesop()
throws DatatypeConfigurationException
{
LOGGER.debug("Creating messageSpec...");

final software.xdev.bzst.dip.client.xmldocument.model.cesop.MessageSpecType messageSpecType =
new software.xdev.bzst.dip.client.xmldocument.model.cesop.MessageSpecType();

messageSpecType.setTransmittingCountry(MSCountryCodeType.fromValue(this.configuration.getTransmittingCountry()
.name()));
messageSpecType.setMessageType(MessageTypeType.fromValue(this.configuration.getMessageType().value()));
messageSpecType.setMessageTypeIndic(MessageTypeIndicType.fromValue(this.configuration.getMessageTypeIndicEnum()
.value()));
messageSpecType.setMessageRefId(this.configuration.getMessageRefId());

final ReportingPeriodType reportingPeriodType = new ReportingPeriodType();
reportingPeriodType.setQuarter(this.configuration.getReportingPeriodCesopQuarter());
reportingPeriodType.setYear(this.configuration.getReportingPeriodCesopYear());
messageSpecType.setReportingPeriod(reportingPeriodType);
final GregorianCalendar gregorianCalendar = GregorianCalendar.from(this.configuration.getTimestamp());
final XMLGregorianCalendar xmlGregorianCalendar =
DatatypeFactory.newInstance().newXMLGregorianCalendar(gregorianCalendar);

final XMLGregorianCalendar xmlGregorianCalendar = DatatypeFactory.newInstance()
.newXMLGregorianCalendar(this.configuration.getTimestamp()
.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));

messageSpecType.setTimestamp(xmlGregorianCalendar);

return messageSpecType;
}

Expand Down