Release 4.1.0 (#116)

GreatG0ose · web-flow · commit e0365a646a77 · 2023-03-29T13:21:59.000+02:00
Co-authored-by: Vladislav Lipianin &lt;&gt;
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,7 +1,7 @@
 name: Publish package to the Maven Central Repository
 on:
   release:
-    types: [ created ]
+    types: [ published ]
 jobs:
   publish:
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres
 to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.1.0](https://github.com/unzerdev/java-sdk/compare/4.0.0..4.1.0)
+
+This release adds functionality to fetch payment page
+
+### Added
+
+* Added `com.unzer.payment.Unzer.fetchPaypage`
+
+### Changed
+
+* Changed return value for `com.unzer.payment.Paypage.getTypeUrl`. Was: `paypage/charge` or `paypage/authorize`, now: `paypage`
+
 ## [4.0.0][4.0.0]
 
 This release brings liability and exemption type support to Java SDK
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Java 1.8 or later.
 <dependency>
   <groupId>com.unzer.payment</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.unzer.payment</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
     <name>Unzer Java SDK</name>
     <description>Unzer Java SDK provides an easy way to connect to the Unzer Rest API.</description>
     <url>https://docs.unzer.com/</url>
@@ -65,7 +65,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>4.0.0</version>
+                <version>3.4.1</version>
             </plugin>
         </plugins>
     </reporting>
diff --git a/src/main/java/com/unzer/payment/Paypage.java b/src/main/java/com/unzer/payment/Paypage.java
@@ -58,11 +58,7 @@ public class Paypage implements PaymentType {
 
     @Override
     public String getTypeUrl() {
-        String action = Optional
-                .ofNullable(this.action)
-                .orElse(Action.CHARGE)
-                .toLowerCase();
-        return "paypage/".concat(action);
+        return "paypage";
     }
 
     public BigDecimal getAmount() {
diff --git a/src/main/java/com/unzer/payment/Unzer.java b/src/main/java/com/unzer/payment/Unzer.java
@@ -1181,6 +1181,15 @@ public Paypage paypage(Paypage paypage) throws HttpCommunicationException {
         return paypageService.initialize(paypage);
     }
 
+    /**
+     * Retrieves created Paypage by id
+     * @param id paypage id
+     * @return paypage
+     */
+    public Paypage fetchPaypage(String id) {
+        return paypageService.fetch(id);
+    }
+
     public Linkpay linkpay(Linkpay linkpay) throws HttpCommunicationException {
         return linkpayService.initialize(linkpay);
     }
diff --git a/src/main/java/com/unzer/payment/service/PaypageService.java b/src/main/java/com/unzer/payment/service/PaypageService.java
@@ -46,7 +46,7 @@ public PaypageService(Unzer unzer, UnzerRestCommunication restCommunication) {
     }
 
     public Paypage initialize(Paypage paypage) throws HttpCommunicationException {
-        return initialize(paypage, urlUtil.getRestUrl(paypage));
+        return initialize(paypage, urlUtil.getInitPaypageUrl(paypage));
     }
 
     public Paypage initialize(Paypage paypage, String url) throws HttpCommunicationException {
@@ -56,5 +56,9 @@ public Paypage initialize(Paypage paypage, String url) throws HttpCommunicationE
         return paypage;
     }
 
-
+    public Paypage fetch(String paypageId) {
+        String response = restCommunication.httpGet(urlUtil.getHttpGetUrl(new Paypage(), paypageId), unzer.getPrivateKey());
+        JsonPaypage jsonPaypage = new JsonParser().fromJson(response, JsonPaypage.class);
+        return jsonToBusinessClassMapper.mapToBusinessObject(new Paypage(), jsonPaypage);
+    }
 }
diff --git a/src/main/java/com/unzer/payment/service/UrlUtil.java b/src/main/java/com/unzer/payment/service/UrlUtil.java
@@ -16,6 +16,7 @@
 package com.unzer.payment.service;
 
 import com.unzer.payment.Basket;
+import com.unzer.payment.Paypage;
 import com.unzer.payment.Recurring;
 import com.unzer.payment.paymenttypes.PaymentType;
 
@@ -136,6 +137,22 @@ public String getHirePurchaseRateUrl(BigDecimal amount, Currency currency, BigDe
         return stringBuilder.toString();
     }
 
+    public String getInitPaypageUrl(Paypage paypage) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(getRestUrl());
+        appendSlashIfNeeded(stringBuilder);
+        stringBuilder.append(paypage.getTypeUrl());
+        appendSlashIfNeeded(stringBuilder);
+
+        String action = Optional
+                .ofNullable(paypage.getAction())
+                .orElse(Paypage.Action.CHARGE)
+                .toLowerCase();
+        stringBuilder.append(action);
+
+        return stringBuilder.toString();
+    }
+
     @Deprecated
     private String getRestUrlInternal(Basket basket) {
         StringBuilder stringBuilder = new StringBuilder();
diff --git a/src/test/java/com/unzer/payment/business/PaypageTest.java b/src/test/java/com/unzer/payment/business/PaypageTest.java
@@ -19,11 +19,11 @@
 import com.unzer.payment.Paypage;
 import com.unzer.payment.Unzer;
 import com.unzer.payment.communication.HttpCommunicationException;
+import com.unzer.payment.service.UrlUtil;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 
-import java.net.MalformedURLException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -34,88 +34,98 @@
 public class PaypageTest extends AbstractPaymentTest {
 
     @Test
-    public void testMaximumPaypage() throws HttpCommunicationException, MalformedURLException {
+    public void testMaximumPaypage() throws HttpCommunicationException {
+        Unzer unzer = getUnzer();
+
         Paypage request = getMaximumPaypage();
-        Paypage response = getUnzer().paypage(request);
-        assertNull(response.getCard3ds());
-
-        assertNotNull(response);
-        assertNotNull(response.getId());
-        assertNotNull(response.getRedirectUrl());
-        assertNotNull(response.getPaymentId());
-
-        assertEquals(request.getCurrency(), response.getCurrency());
-        assertEquals(request.getReturnUrl(), response.getReturnUrl());
-        assertEquals(request.getShopName(), response.getShopName());
-        assertEquals(request.getShopDescription(), response.getShopDescription());
-        assertEquals(request.getTagline(), response.getTagline());
-        assertEquals(request.getTermsAndConditionUrl().toString(), response.getTermsAndConditionUrl().toString());
-        assertEquals(request.getPrivacyPolicyUrl().toString(), response.getPrivacyPolicyUrl().toString());
-        assertEquals(request.getLogoImage(), response.getLogoImage());
-        assertEquals(request.getFullPageImage(), response.getFullPageImage());
-        assertEquals(request.getContactUrl().toString(), response.getContactUrl().toString());
-        assertEquals(request.getHelpUrl().toString(), response.getHelpUrl().toString());
-        assertEquals(request.getImprintUrl().toString(), response.getImprintUrl().toString());
-        assertEquals(request.getTermsAndConditionUrl().toString(), response.getTermsAndConditionUrl().toString());
-        assertEquals(request.getPrivacyPolicyUrl().toString(), response.getPrivacyPolicyUrl().toString());
-        assertEquals(request.getInvoiceId(), response.getInvoiceId());
-        assertEquals(request.getOrderId(), response.getOrderId());
-        assertEquals(request.getBillingAddressRequired(), response.getBillingAddressRequired());
-        assertEquals(request.getShippingAddressRequired(), response.getShippingAddressRequired());
-        assertEquals(Arrays.toString(request.getExcludeTypes()), Arrays.toString(response.getExcludeTypes()));
-        assertEquals("charge", response.getAction().toLowerCase());
-
-        for (String key : response.getCss().keySet()) {
-            assertEquals(request.getCss().get(key), response.getCss().get(key));
+        Paypage createdPaypage = unzer.paypage(request);
+
+        Paypage fetchedPaypage = unzer.fetchPaypage(createdPaypage.getId());
+
+        assertNull(fetchedPaypage.getCard3ds());
+        assertNotNull(fetchedPaypage);
+        assertNotNull(fetchedPaypage.getId());
+        assertNotNull(fetchedPaypage.getRedirectUrl());
+        assertNotNull(fetchedPaypage.getPaymentId());
+
+        assertEquals(request.getCurrency(), fetchedPaypage.getCurrency());
+        assertEquals(request.getReturnUrl(), fetchedPaypage.getReturnUrl());
+        assertEquals(request.getShopName(), fetchedPaypage.getShopName());
+        assertEquals(request.getShopDescription(), fetchedPaypage.getShopDescription());
+        assertEquals(request.getTagline(), fetchedPaypage.getTagline());
+        assertEquals(request.getTermsAndConditionUrl().toString(), fetchedPaypage.getTermsAndConditionUrl().toString());
+        assertEquals(request.getPrivacyPolicyUrl().toString(), fetchedPaypage.getPrivacyPolicyUrl().toString());
+        assertEquals(request.getLogoImage(), fetchedPaypage.getLogoImage());
+        assertEquals(request.getFullPageImage(), fetchedPaypage.getFullPageImage());
+        assertEquals(request.getContactUrl().toString(), fetchedPaypage.getContactUrl().toString());
+        assertEquals(request.getHelpUrl().toString(), fetchedPaypage.getHelpUrl().toString());
+        assertEquals(request.getImprintUrl().toString(), fetchedPaypage.getImprintUrl().toString());
+        assertEquals(request.getTermsAndConditionUrl().toString(), fetchedPaypage.getTermsAndConditionUrl().toString());
+        assertEquals(request.getPrivacyPolicyUrl().toString(), fetchedPaypage.getPrivacyPolicyUrl().toString());
+        assertEquals(request.getInvoiceId(), fetchedPaypage.getInvoiceId());
+        assertEquals(request.getOrderId(), fetchedPaypage.getOrderId());
+        assertEquals(request.getBillingAddressRequired(), fetchedPaypage.getBillingAddressRequired());
+        assertEquals(request.getShippingAddressRequired(), fetchedPaypage.getShippingAddressRequired());
+        assertEquals(Arrays.toString(request.getExcludeTypes()), Arrays.toString(fetchedPaypage.getExcludeTypes()));
+        assertEquals("charge", fetchedPaypage.getAction().toLowerCase());
+
+        for (String key : fetchedPaypage.getCss().keySet()) {
+            assertEquals(request.getCss().get(key), fetchedPaypage.getCss().get(key));
         }
     }
 
     @Test
-    public void testPaypage_WithEmptyCssMap() throws MalformedURLException, HttpCommunicationException {
+    public void testPaypage_WithEmptyCssMap() throws HttpCommunicationException {
+        Unzer unzer = getUnzer();
+
         Paypage request = getMaximumPaypage();
         request.setCss(null);
 
-        Paypage response = getUnzer().paypage(request);
-        assertNull(response.getCard3ds());
-
-        assertNotNull(response);
-        assertNotNull(response.getId());
-        assertNotNull(response.getRedirectUrl());
-        assertNotNull(response.getPaymentId());
-
-        assertEquals(request.getCurrency(), response.getCurrency());
-        assertEquals(request.getReturnUrl(), response.getReturnUrl());
-        assertEquals(request.getShopName(), response.getShopName());
-        assertEquals(request.getShopDescription(), response.getShopDescription());
-        assertEquals(request.getTagline(), response.getTagline());
-        assertEquals(request.getTermsAndConditionUrl().toString(), response.getTermsAndConditionUrl().toString());
-        assertEquals(request.getPrivacyPolicyUrl().toString(), response.getPrivacyPolicyUrl().toString());
-        assertEquals(request.getLogoImage(), response.getLogoImage());
-        assertEquals(request.getFullPageImage(), response.getFullPageImage());
-        assertEquals(request.getContactUrl().toString(), response.getContactUrl().toString());
-        assertEquals(request.getHelpUrl().toString(), response.getHelpUrl().toString());
-        assertEquals(request.getImprintUrl().toString(), response.getImprintUrl().toString());
-        assertEquals(request.getTermsAndConditionUrl().toString(), response.getTermsAndConditionUrl().toString());
-        assertEquals(request.getPrivacyPolicyUrl().toString(), response.getPrivacyPolicyUrl().toString());
-        assertEquals(request.getInvoiceId(), response.getInvoiceId());
-        assertEquals(request.getOrderId(), response.getOrderId());
-        assertEquals(request.getBillingAddressRequired(), response.getBillingAddressRequired());
-        assertEquals(request.getShippingAddressRequired(), response.getShippingAddressRequired());
-        assertEquals(Arrays.toString(request.getExcludeTypes()), Arrays.toString(response.getExcludeTypes()));
-        assertEquals("charge", response.getAction().toLowerCase());
+        Paypage createdPaypage = unzer.paypage(request);
+
+        Paypage fetchedPaypage = unzer.fetchPaypage(createdPaypage.getId());
+
+        assertNull(fetchedPaypage.getCard3ds());
+
+        assertNotNull(fetchedPaypage);
+        assertNotNull(fetchedPaypage.getId());
+        assertNotNull(fetchedPaypage.getRedirectUrl());
+        assertNotNull(fetchedPaypage.getPaymentId());
+
+        assertEquals(request.getCurrency(), fetchedPaypage.getCurrency());
+        assertEquals(request.getReturnUrl(), fetchedPaypage.getReturnUrl());
+        assertEquals(request.getShopName(), fetchedPaypage.getShopName());
+        assertEquals(request.getShopDescription(), fetchedPaypage.getShopDescription());
+        assertEquals(request.getTagline(), fetchedPaypage.getTagline());
+        assertEquals(request.getTermsAndConditionUrl().toString(), fetchedPaypage.getTermsAndConditionUrl().toString());
+        assertEquals(request.getPrivacyPolicyUrl().toString(), fetchedPaypage.getPrivacyPolicyUrl().toString());
+        assertEquals(request.getLogoImage(), fetchedPaypage.getLogoImage());
+        assertEquals(request.getFullPageImage(), fetchedPaypage.getFullPageImage());
+        assertEquals(request.getContactUrl().toString(), fetchedPaypage.getContactUrl().toString());
+        assertEquals(request.getHelpUrl().toString(), fetchedPaypage.getHelpUrl().toString());
+        assertEquals(request.getImprintUrl().toString(), fetchedPaypage.getImprintUrl().toString());
+        assertEquals(request.getTermsAndConditionUrl().toString(), fetchedPaypage.getTermsAndConditionUrl().toString());
+        assertEquals(request.getPrivacyPolicyUrl().toString(), fetchedPaypage.getPrivacyPolicyUrl().toString());
+        assertEquals(request.getInvoiceId(), fetchedPaypage.getInvoiceId());
+        assertEquals(request.getOrderId(), fetchedPaypage.getOrderId());
+        assertEquals(request.getBillingAddressRequired(), fetchedPaypage.getBillingAddressRequired());
+        assertEquals(request.getShippingAddressRequired(), fetchedPaypage.getShippingAddressRequired());
+        assertEquals(Arrays.toString(request.getExcludeTypes()), Arrays.toString(fetchedPaypage.getExcludeTypes()));
+        assertEquals("charge", fetchedPaypage.getAction().toLowerCase());
     }
 
     @TestFactory
     public Collection<DynamicTest> testRestUrl() {
+        UrlUtil urlUtil = new UrlUtil("any-key");
         class TestCase {
-            String name;
-            String action;
-            String expectedUrl;
+            final String name;
+            final String action;
+            final String expectedUrlPart;
 
-            public TestCase(String name, String action, String expectedUrl) {
+            public TestCase(String name, String action, String expectedUrlPart) {
                 this.name = name;
                 this.action = action;
-                this.expectedUrl = expectedUrl;
+                this.expectedUrlPart = expectedUrlPart;
             }
         }
 
@@ -138,16 +148,22 @@ public TestCase(String name, String action, String expectedUrl) {
         ).map(t -> DynamicTest.dynamicTest(t.name, () -> {
             Paypage paypage = getMaximumPaypage()
                     .setAction(t.action);
-            assertEquals(t.expectedUrl, paypage.getTypeUrl());
+
+            String actualUrl = urlUtil.getInitPaypageUrl(paypage);
+            String expectedUrl = urlUtil.getRestUrl() + t.expectedUrlPart;
+
+            assertEquals(expectedUrl, actualUrl);
         })).collect(Collectors.toList());
     }
 
     @Test
     public void testAuthorize() throws HttpCommunicationException {
         Unzer unzer = getUnzer();
         Paypage request = getMaximumPaypage().setAction(Paypage.Action.AUTHORIZE);
+        Paypage createdPaypage = unzer.paypage(request);
+
+        Paypage fetchedPaypage = unzer.fetchPaypage(createdPaypage.getId());
 
-        Paypage response = unzer.paypage(request);
-        assertEquals("AUTHORIZE", response.getAction());
+        assertEquals("AUTHORIZE", fetchedPaypage.getAction());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public PaypageService(Unzer unzer, UnzerRestCommunication restCommunication) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public Paypage initialize(Paypage paypage) throws HttpCommunicationException {`
`49`		`- return initialize(paypage, urlUtil.getRestUrl(paypage));`
	`49`	`+ return initialize(paypage, urlUtil.getInitPaypageUrl(paypage));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public Paypage initialize(Paypage paypage, String url) throws HttpCommunicationException {`
`@@ -56,5 +56,9 @@ public Paypage initialize(Paypage paypage, String url) throws HttpCommunicationE`
`56`	`56`	`return paypage;`
`57`	`57`	`}`
`58`	`58`
`59`		`-`
	`59`	`+ public Paypage fetch(String paypageId) {`
	`60`	`+ String response = restCommunication.httpGet(urlUtil.getHttpGetUrl(new Paypage(), paypageId), unzer.getPrivateKey());`
	`61`	`+ JsonPaypage jsonPaypage = new JsonParser().fromJson(response, JsonPaypage.class);`
	`62`	`+ return jsonToBusinessClassMapper.mapToBusinessObject(new Paypage(), jsonPaypage);`
	`63`	`+ }`
`60`	`64`	`}`