Skip to content

Commit

Permalink
Fix big decimal (#35)
Browse files Browse the repository at this point in the history
* some changes

1. replace integer instead of bigdecimal
2. add github actions
3. add linter
4. config unit test files correctly

* rename github action file

* change github command verify

* Revert "change github command verify"

This reverts commit 78877eb.

* add checkstyle step

* update version

add 3.0.2-SNAPSHOT
  • Loading branch information
fcarrero authored Dec 13, 2022
1 parent f090058 commit 46c4256
Show file tree
Hide file tree
Showing 17 changed files with 113 additions and 49 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
cache: maven
- name: Build with Maven
run: mvn --batch-mode --update-snapshots package
- name: checkstyle
run: mvn --batch-mode --update-snapshots checkstyle:checkstyle
28 changes: 28 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="charset" value="UTF-8" />

<property name="severity" value="error" />

<property name="fileExtensions" value="java, properties, xml" />
<!-- Excludes all 'module-info.java' files -->
<!-- See https://checkstyle.org/config_filefilters.html -->

<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
<module name="SuppressionFilter">
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}" default="checkstyle-suppressions.xml" />
<property name="optional" value="true" />
</module>

<!-- Checks for whitespace -->
<!-- See http://checkstyle.org/config_whitespace.html -->
<module name="FileTabCharacter">
<property name="eachLine" value="true" />
</module>
<module name="TreeWalker">
<module name="UnusedImports"/>
</module>
</module>

40 changes: 37 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>io.conekta</groupId>
<artifactId>ct-conekta-java</artifactId>
<version>3.0.1</version>
<version>3.0.2-SNAPSHOT</version>

<name>ct-conekta-java</name>
<description>This is a java library that allows interaction with https://api.conekta.io API.</description>
Expand All @@ -17,6 +17,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<checkstyle-maven-plugin.version>3.0.0</checkstyle-maven-plugin.version>
</properties>

<licenses>
Expand Down Expand Up @@ -72,6 +73,13 @@
<version>4.10.0</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
</dependency>

</dependencies>
<distributionManagement>
<snapshotRepository>
Expand All @@ -81,6 +89,15 @@
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle-maven-plugin.version}</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>

</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -119,8 +136,8 @@
<goal>sign</goal>
</goals>
<configuration>
<keyname>0xD8F4E014</keyname>
<passphraseServerId>0xD8F4E014</passphraseServerId>
<keyname>0x1CB9EF02</keyname>
<passphraseServerId></passphraseServerId>
</configuration>
</execution>
</executions>
Expand All @@ -136,6 +153,23 @@
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle-maven-plugin.version}</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
6 changes: 0 additions & 6 deletions src/main/java/conekta/io/model/impl/Balance.java

This file was deleted.

5 changes: 2 additions & 3 deletions src/main/java/conekta/io/model/impl/Order.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import conekta.io.model.submodel.*;
import lombok.Data;

import java.math.BigDecimal;

/**
* Frase corta descriptiva
Expand All @@ -24,8 +23,8 @@ public class Order extends ConektaObject {
* Comportamiento en caso de que sea null(si aplica)
*/
private Boolean livemode;
private BigDecimal amount;
private BigDecimal amountRefunded;
private Integer amount;
private Integer amountRefunded;
private String paymentStatus;
private String currency;
private Integer createdAt;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/conekta/io/model/request/OrderRefundReq.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class OrderRefundReq extends ConektaObject {
private String reason;
private BigDecimal amount;
private Integer amount;
}
11 changes: 5 additions & 6 deletions src/main/java/conekta/io/model/submodel/Charge.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@
import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class Charge extends ConektaObject {
private String status;
private BigDecimal amount;
private BigDecimal fee;
private Integer amount;
private Integer fee;
private String orderId;
private String customerId;
private Boolean livemode;
private BigDecimal monthlyInstallments;
private BigDecimal createdAt;
private BigDecimal paidAt;
private Integer monthlyInstallments;
private Integer createdAt;
private Integer paidAt;
private String currency;
private String description;
private PaymentMethod paymentMethod;
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/conekta/io/model/submodel/Checkout.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
Expand All @@ -12,23 +11,23 @@ public class Checkout extends ConektaObject {
private List<Integer> monthlyInstallmentsOptions;
private List<String> allowedPaymentMethods;
private List<Object> excludeCardNetworks;
private BigDecimal emailsSent;
private Integer emailsSent;
private String successUrl;
private String failureUrl;
private BigDecimal expiredAt;
private BigDecimal expiresAt;
private BigDecimal startsAt;
private Integer expiredAt;
private Integer expiresAt;
private Integer startsAt;
private Boolean force3dsFlow;
private Boolean livemode;
private Boolean monthlyInstallmentsEnabled;
private Boolean isRedirectOnFailure;
private Boolean canNotExpire;
private String name;
private Boolean needsShippingContact;
private BigDecimal paidPaymentsCount;
private Integer paidPaymentsCount;
private Boolean recurrent;
private String slug;
private BigDecimal smsSent;
private Integer smsSent;
private String status;
private String type;
private String url;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/conekta/io/model/submodel/ConektaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class ConektaData extends ConektaObject {
private String description;
private BigDecimal amount;
private Integer amount;
private String parentId;
}
3 changes: 1 addition & 2 deletions src/main/java/conekta/io/model/submodel/DiscountLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class DiscountLine extends ConektaObject {
private String code;
private BigDecimal amount;
private Integer amount;
private String type;
private String parentId;
private Boolean deleted;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/conekta/io/model/submodel/LineItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
public class LineItem extends ConektaData {
private String name;
private BigDecimal unitPrice;
private Integer unitPrice;
private Integer quantity;
private List<String> tags;
private Object metadata;
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/conekta/io/model/submodel/PaymentMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
import lombok.Data;
import lombok.ToString;

import java.math.BigDecimal;

@Data
public class PaymentMethod extends ConektaObject {

private String type;
private BigDecimal createdAt;
private Integer createdAt;
private String last4;
private String bin;
private String expMonth;
Expand All @@ -24,12 +23,12 @@ public class PaymentMethod extends ConektaObject {
private String storeName;
private String serviceName;
private String serviceNumber;
private BigDecimal expiresAt;
private Integer expiresAt;
private String description;
private String authCode;
private String store;
private DefaultAddress address;
private String tokenID;
private String paymentSourceID;
private BigDecimal monthlyInstallments;
private Integer monthlyInstallments;
}
4 changes: 1 addition & 3 deletions src/main/java/conekta/io/model/submodel/PaymentSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class PaymentSource extends ConektaObject {
private String type;
Expand All @@ -21,6 +19,6 @@ public class PaymentSource extends ConektaObject {
private Boolean isDefault;
private Boolean visibleOnCheckout;
private String paymentType;
private BigDecimal expiresAt;
private Integer expiresAt;
private Card card;
}
4 changes: 1 addition & 3 deletions src/main/java/conekta/io/model/submodel/ShippingLines.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import lombok.Data;

import java.math.BigDecimal;

@Data
public class ShippingLines extends ConektaData {
private String carrier;
private String method;
private String trackingNumber;
private BigDecimal amount;
private Integer amount;
}
5 changes: 1 addition & 4 deletions src/main/java/conekta/io/model/submodel/TaxLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@

import conekta.io.model.ConektaObject;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class TaxLine extends ConektaObject {
private String description;
private BigDecimal amount;
private Integer amount;
private String parentId;
private Boolean deleted;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package conekta.io;
package conekta.io.client.impl;

import conekta.io.Utils;
import conekta.io.client.ConektaResponse;
import conekta.io.client.impl.CustomersClient;
import conekta.io.config.ConektaAuthenticator;
import conekta.io.config.ConektaObjectMapper;
import conekta.io.error.ConektaErrorResponse;
Expand Down

0 comments on commit 46c4256

Please sign in to comment.