Updated models ; Added missing endpoints ; Added beta voucher properties ; Upgraded dependencies ; Bumping version to 4.5.0

Author: Wout Schoovaerts

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 4.5.0
+
+- Updated request objects to add missing properties
+- Updated response objects to add missing properties
+- Added beta voucher properties
+- Removed QueryParams.EMPTY
+- Deprecated OrderHandler
+- Deprecated ShipmentHandler
+- Added Client links API
+
 ## 4.4.3
  - Switched to OffsetDateTime
 

README.md

@@ -20,14 +20,14 @@ This library requires Java 11+.
 <dependency>
     <groupId>be.woutschoovaerts</groupId>
     <artifactId>mollie</artifactId>
-    <version>4.4.3</version>
+    <version>4.5.0</version>
 </dependency>
 ```
 
 2. Build a client
 ```
 Client client = new ClientBuilder()
-                       .withApiKey("test_hW7trRMaJphr8feGzMNtd5SwShQSwg")
+                       .withApiKey("test_plsW7trRMaJphr8feGzMNtd5SwShQSwg")
                        .build();
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>be.woutschoovaerts</groupId>
     <artifactId>mollie</artifactId>
-    <version>4.4.3</version>
+    <version>4.5.0</version>
 
     <name>Mollie with Java</name>
     <description>Java framework to consume the Mollie API</description>
@@ -15,7 +15,7 @@
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 
@@ -35,18 +35,18 @@
     </scm>
 
     <properties>
-        <commons-lang3.version>3.13.0</commons-lang3.version>
-        <jackson.version>2.15.2</jackson.version>
+        <commons-lang3.version>3.17.0</commons-lang3.version>
+        <jackson.version>2.18.2</jackson.version>
         <java.version>11</java.version>
         <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
         <jaxb-core.version>4.0.3</jaxb-core.version>
-        <junit-jupiter-engine.version>5.10.0</junit-jupiter-engine.version>
-        <log4j.version>2.20.0</log4j.version>
-        <lombok.version>1.18.28</lombok.version>
+        <junit-jupiter-engine.version>5.11.3</junit-jupiter-engine.version>
+        <log4j.version>2.24.2</log4j.version>
+        <lombok.version>1.18.36</lombok.version>
         <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
         <maven-jdk-tools-wrapper.version>0.1</maven-jdk-tools-wrapper.version>
-        <mockito-core.version>5.5.0</mockito-core.version>
-        <slf4j-api.version>2.0.9</slf4j-api.version>
+        <mockito-core.version>5.14.2</mockito-core.version>
+        <slf4j-api.version>2.0.16</slf4j-api.version>
         <unirest-java.version>3.14.5</unirest-java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -106,31 +106,6 @@
             <version>${slf4j-api.version}</version>
         </dependency>
 
-        <!-- Needed for Java 9+ -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb-api.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${jaxb-core.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>${jaxb-core.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.olivergondza</groupId>
-            <artifactId>maven-jdk-tools-wrapper</artifactId>
-            <version>${maven-jdk-tools-wrapper.version}</version>
-        </dependency>
-
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -226,7 +201,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.3.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -240,7 +215,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.5.0</version>
+                        <version>3.11.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -260,7 +235,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

src/main/java/be/woutschoovaerts/mollie/Client.java

@@ -4,6 +4,7 @@
 import be.woutschoovaerts.mollie.handler.business.InvoiceHandler;
 import be.woutschoovaerts.mollie.handler.business.SettlementHandler;
 import be.woutschoovaerts.mollie.handler.client.ClientHandler;
+import be.woutschoovaerts.mollie.handler.client.ClientLinkHandler;
 import be.woutschoovaerts.mollie.handler.connect.*;
 import be.woutschoovaerts.mollie.handler.orders.OrderHandler;
 import be.woutschoovaerts.mollie.handler.orders.ShipmentHandler;
@@ -155,6 +156,7 @@ public CaptureHandler captures() {
      *
      * @return OrderHandler object
      */
+    @Deprecated
     public OrderHandler orders() {
         return new OrderHandler(restService);
     }
@@ -164,6 +166,7 @@ public OrderHandler orders() {
      *
      * @return ShipmentHandler object
      */
+    @Deprecated
     public ShipmentHandler shipments() {
         return new ShipmentHandler(restService);
     }
@@ -285,6 +288,15 @@ public TerminalHandler terminals() {
         return new TerminalHandler(restService);
     }
 
+    /**
+     * Handles client link actions
+     *
+     * @return ClientLinkHandler object
+     */
+    public ClientLinkHandler clientLinks() {
+        return new ClientLinkHandler(restService);
+    }
+
     private void initUniRest(ClientProxy proxy) {
         Unirest.config()
             .setObjectMapper(new JacksonObjectMapper());

src/main/java/be/woutschoovaerts/mollie/data/balance/BalanceResponse.java

@@ -19,10 +19,12 @@ public class BalanceResponse {
 
     private String id;
 
-    private OffsetDateTime createdAt;
+    private String mode;
 
     private String currency;
 
+    private String description;
+
     private BalanceStatus status;
 
     private TransferFrequency transferFrequency;
@@ -33,10 +35,13 @@ public class BalanceResponse {
 
     private TransferDestination transferDestination;
 
+
     private Amount availableAmount;
 
     private Amount pendingAmount;
 
+    private OffsetDateTime createdAt;
+
     @JsonProperty("_links")
     private BalanceLinks links;
 

src/main/java/be/woutschoovaerts/mollie/data/balance/BalanceTransactionResponse.java

@@ -7,7 +7,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.util.Map;
 
@@ -29,10 +28,10 @@ public class BalanceTransactionResponse {
 
     private Amount deductions;
 
-    private OffsetDateTime createdAt;
-
     private Map<String, String> context;
 
+    private OffsetDateTime createdAt;
+
     @JsonProperty("_links")
     private BalanceLinks links;
 

src/main/java/be/woutschoovaerts/mollie/data/capture/CaptureEmbedded.java

@@ -0,0 +1,16 @@
+package be.woutschoovaerts.mollie.data.capture;
+
+import be.woutschoovaerts.mollie.data.payment.PaymentResponse;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class CaptureEmbedded {
+
+    private PaymentResponse payment;
+}

src/main/java/be/woutschoovaerts/mollie/data/capture/CaptureRequest.java

@@ -0,0 +1,25 @@
+package be.woutschoovaerts.mollie.data.capture;
+
+import be.woutschoovaerts.mollie.data.common.Amount;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+import java.util.Optional;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class CaptureRequest {
+
+    @Builder.Default
+    private Optional<String> description = Optional.empty();
+
+    @Builder.Default
+    private Optional<Amount> amount = Optional.empty();
+
+    private Map<String, Object> metadata;
+}

src/main/java/be/woutschoovaerts/mollie/data/capture/CaptureResponse.java

@@ -9,6 +9,7 @@
 import lombok.NoArgsConstructor;
 
 import java.time.OffsetDateTime;
+import java.util.Map;
 import java.util.Optional;
 
 @Data
@@ -23,9 +24,17 @@ public class CaptureResponse {
 
     private String mode;
 
-    private Amount amount;
+    private String description;
 
-    private Amount settlementAmount;
+    @Builder.Default
+    private Optional<Amount> amount = Optional.empty();
+
+    @Builder.Default
+    private Optional<Amount> settlementAmount = Optional.empty();
+
+    private CaptureStatus status;
+
+    private Map<String, Object> metadata;
 
     private String paymentId;
 
@@ -39,4 +48,8 @@ public class CaptureResponse {
 
     @JsonProperty("_links")
     private CaptureLinks links;
+
+    @JsonProperty("_embedded")
+    @Builder.Default
+    private Optional<CaptureEmbedded> embedded = Optional.empty();
 }

src/main/java/be/woutschoovaerts/mollie/data/capture/CaptureStatus.java

@@ -0,0 +1,15 @@
+package be.woutschoovaerts.mollie.data.capture;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum CaptureStatus {
+
+    PENDING,
+    SUCCEEDED,
+    FAILED;
+
+    @JsonValue
+    public String getJsonValue() {
+        return name().toLowerCase();
+    }
+}