PP6-117 paytrail java sdk GitHub workflow

.github/workflows/CI_test.yml

@@ -0,0 +1,41 @@
+name: Lint and Test
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [8,11,17,18,19,20,21,22,23]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: temurin
+      - name: Check current Java version
+        run: java -version
+
+        # Step 3: Validate Maven dependencies
+      - name: Validate Maven dependencies with Java ${{ matrix.java-version }}
+        working-directory: ./paytrailpayment-sdk
+        run: mvn dependency:resolve
+
+        # Step 4: Run Maven lint checks (Checkstyle, SpotBugs, etc.)
+      - name: Run Maven lint checks with Java ${{ matrix.java-version }}
+        working-directory: ./paytrailpayment-sdk
+        run: mvn checkstyle:check
+
+        # Step 5: Run Maven tests
+      - name: Run Maven tests with Java ${{ matrix.java-version }}
+        working-directory: ./paytrailpayment-sdk
+        run: mvn test

paytrailpayment-app/pom.xml

@@ -16,7 +16,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.36</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -34,6 +35,12 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.paytrailpayment</groupId>
+            <artifactId>paytrailpayment-sdk</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

paytrailpayment-app/src/main/java/io/paytrailpayment/Main.java

@@ -1,12 +1,11 @@
 package io.paytrailpayment;
 
 import io.paytrailpayment.dto.request.CreatePaymentRequest;
-import io.paytrailpayment.dto.request.model.CallbackUrl;
-import io.paytrailpayment.dto.request.model.Customer;
-import io.paytrailpayment.dto.request.model.Item;
+import io.paytrailpayment.dto.request.model.*;
 import io.paytrailpayment.dto.response.CreatePaymentResponse;
 import io.paytrailpayment.utilites.ResponseMessage;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -19,16 +18,16 @@ public static void main(String[] args) {
 
         req.setStamp(UUID.randomUUID().toString());
         req.setReference("9187445");
-        req.setCurrency("EUR");
-        req.setLanguage("FI");
+        req.setCurrency(PaytrailCurrency.EUR);
+        req.setLanguage(PaytrailLanguage.FI);
         req.setOrderId("12335");
         req.setAmount(1590);
 
         List<Item> items = new ArrayList<>();
         Item item = new Item();
         item.setUnitPrice(1590);
         item.setUnits(1);
-        item.setVatPercentage(24);
+        item.setVatPercentage(new BigDecimal(24));
         item.setProductCode("#927502759");
         items.add(item);
 

paytrailpayment-sdk/pom.xml

@@ -15,7 +15,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.36</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -55,11 +56,63 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
     </dependencies>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.36</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+
+            <!-- Maven Surefire Plugin for Running Unit Tests -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.2</version>
+            </plugin>
+
+            <!-- Checkstyle Plugin for Code Linting -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <configLocation>google_checks.xml</configLocation>
+                    <failOnViolation>true</failOnViolation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

paytrailpayment-sdk/src/main/java/io/paytrailpayment/IPaytrail.java

@@ -1,10 +1,7 @@
 package io.paytrailpayment;
 
-import io.paytrailpayment.dto.request.CreatePaymentRequest;
-import io.paytrailpayment.dto.request.CreateRefundRequest;
-import io.paytrailpayment.dto.response.CreatePaymentResponse;
-import io.paytrailpayment.dto.response.CreateRefundResponse;
-import io.paytrailpayment.dto.response.GetPaymentResponse;
+import io.paytrailpayment.dto.request.*;
+import io.paytrailpayment.dto.response.*;
 
 /**
  * Defines methods for interacting with the Paytrail payment system.
@@ -27,6 +24,7 @@ public interface IPaytrail {
      *    Note! The transaction id needs to be sent on checkout-transaction-id header as well.
      *
      * @param transactionId The unique identifier for the transaction.
+     * @return GetPaymentResponse
      * @see <a href="https://docs.paytrail.com/#/?id=get">Paytrail Documentation - Get Payment</a>
      */
     GetPaymentResponse getPaymentInfo(String transactionId);
@@ -36,7 +34,82 @@ public interface IPaytrail {
      *
      * @param refundRequest   The request object containing refund details.
      * @param transactionId   The unique identifier for the transaction to refund.
+     * @return CreateRefundResponse
      * @see <a href="https://docs.paytrail.com/#/?id=refund">Paytrail Documentation - Create Refund Request</a>
      */
     CreateRefundResponse createRefundRequest(CreateRefundRequest refundRequest, String transactionId);
+
+    /**
+     * HTTP POST /tokenization/addcard-form add card form.
+     *
+     * @param req   The request object containing add card request
+     * @return AddCardFormResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=add-card-form">Paytrail Documentation - Create Refund Request</a>
+     */
+    AddCardFormResponse createAddCardFormRequest(AddCardFormRequest req);
+
+    /**
+     * HTTP POST /payments/token/mit/charge creates a new MIT payment charge.
+     * @param req
+     * @return CreateMitPaymentChargeResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=create-authorization-hold-or-charge">Paytrail Documentation  - Create authorization hold or charge
+     */
+    CreateMitOrCitPaymentResponse createMitPaymentCharge(CreateMitOrCitPaymentRequest req);
+    /**
+     * HTTP POST /payments/token/mit/authorization-hold creates a new MIT authorization hold.
+     * @param createMitPaymentAuthorizationHold
+     * @return CreateMitPaymentChargeResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=create-authorization-hold-or-charge">Paytrail Documentation  - Create authorization hold or charge
+     */
+    CreateMitOrCitPaymentResponse createMitPaymentAuthorizationHold(CreateMitOrCitPaymentRequest createMitPaymentAuthorizationHold);
+
+    /**
+     * HTTP POST /payments/{transactionId}/token/commit commits a MIT payment.
+     * @param req
+     * @param transactionId
+     * @return CreateMitOrCitPaymentResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=commit-authorization-hold">Paytrail Documentation  - Create MIT payment commit
+     */
+    CreateMitOrCitPaymentResponse createMitPaymentCommit(CreateMitOrCitPaymentRequest req, String transactionId);
+
+    /**
+     * HTTP POST /payments/token/cit/charge creates a new CIT payment charge.
+     * @param req
+     * @return CreateMitOrCitPaymentResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=create-authorization-hold-or-charge">Paytrail Documentation  - Create authorization hold or charge
+     */
+    CreateMitOrCitPaymentResponse createCitPaymentCharge(CreateMitOrCitPaymentRequest req);
+
+
+    /**
+     * HTTP POST /payments/token/cit/authorization-hold creates a new CIT authorization hold.
+     * @param req
+     * @return CreateMitOrCitPaymentResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=create-authorization-hold-or-charge">Paytrail Documentation  - Create CIT authorization hold
+     */
+    CreateMitOrCitPaymentResponse createCitPaymentAuthorizationHold(CreateMitOrCitPaymentRequest req);
+
+    /**
+     * HTTP POST /payments/{transactionId}/token/commit commits a CIT payment.
+     * @param req
+     * @param transactionId
+     * @return CreateMitOrCitPaymentResponse
+     * @see <a href="https://docs.paytrail.com/#/?id=commit-authorization-hold">Paytrail Documentation  - Create CIT payment commit
+     */
+    CreateMitOrCitPaymentResponse createCitPaymentCommit(CreateMitOrCitPaymentRequest req, String transactionId);
+
+    /**
+     * HTTP POST /tokenization/pay-and-add-card pay and add card.
+     * @param req
+     * @return
+     */
+    PayAddCardResponse payAndAddCard(PayAddCardRequest req);
+
+  /**
+   *
+   * HTTP POST /tokenization/get-token get token.
+   * @param req
+   * @return the actual card token which can then be used to make payments on the card
+   */
+  GetTokenResponse createGetTokenRequest(GetTokenRequest req);
 }