Merge pull request #80 from unzerdev/develop

Release v1.2.0.0

Author: GreatG0ose

.github/workflows/maven.yml

@@ -0,0 +1,28 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  pull_request:
+
+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: 'temurin'
+          cache: maven
+      - name: Set timezone
+        run: sudo timedatectl set-timezone Europe/Berlin
+      - name: Run unit tests
+        env:
+          PAPI_PUBLIC_KEY: ${{ secrets.PAPI_PUBLIC_KEY }}
+          PAPI_PRIVATE_KEY: ${{ secrets.PAPI_PRIVATE_KEY }}
+        run: mvn -B test --file pom.xml -Dpublickey1="$PAPI_PUBLIC_KEY" -Dprivatekey1="$PAPI_PRIVATE_KEY" -Dprivatekey2="$PAPI_PRIVATE_KEY" -Dprivatekey3="$PAPI_PRIVATE_KEY" -DmarketplacePrivatekey="$PAPI_PRIVATE_KEY"

.gitignore

@@ -1,44 +1,10 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
 
-### maven ###
+### Maven ###
 .mvn/
 mvnm.*
 
-### Gradle ###
-.gradle/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
 ### IntelliJ IDEA ###
 .idea
-*.iws
 *.iml
-*.ipr
-
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
-mvnw
-mvnw.cmd
-db/papi_db.script
-db/papi_db.properties
-db/papi_db.lck
-db/papi_db.log
-db/papi_database.mv.db
-/db/
-/logging.log
-/logs/
-/log/
-/sns_auto_gen_folder/
-docs/node_modules/

.idea/.gitignore

@@ -2,33 +2,93 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres
+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).
 
+## [1.2.0.0][1.2.0.0]
+
+### Breaking changes 
+
+*   Removed `log4j-core` from Maven dependencies. **Please, provide logger
+    implementation on your own**
+
+*   Renamed enum value `AbstractTransaction.Status.ERRROR` to `AbstractTransaction.Status.ERROR`
+
+*   Renamed enum value `Paypage.Status.ERRROR` to `Paypage.Status.ERROR`
+
+### Deprecated
+
+*   `com.unzer.payment.service.UrlUtil#getUrl(String)` will not be part of
+    java-sdk, because it has nothing to do with unzer/sdk specific logic. If you
+    rely on this method, please, replace it with `java.net.URL#URL(String)`
+    constructor call
+
+*   Deprecated Basket getters/setters: `amountTotalVat`, `amountTotalGross`,
+    `amountTotalDiscount`
+
+*   Deprecated BasketItem getters/setters: `amountDiscount`, `amountGross`, `amountVat`,
+    `amountPerUnit`, `amountNet`
+
+### Added
+
+*   Basket v2 support:
+
+    *   Basket getters/setters: `totalValueGross`
+
+    *   BasketItem getters/setters: `amountPerUnitGross`, `amountDiscountPerUnitGross`
+
+### Removed
+
+*   Remove `log.error` in catch clause 
+    `com.unzer.payment.service.PropertiesUtil#loadProperties()` because the
+    exception with exact same message is thrown after the `log.error` call.
+
+### Fixed
+
+*   Fix log message of `com.unzer.payment.service.UrlUtil#getUrl(String)`. It was
+    not formatted and contained `%s` instead
+    of values
+
+### Changed
+
+*   Type of `BasketItem` type field (was `String`, become `BasketItem.Type`)
+
+*   Type of `BasketItem` `vat` field (was `Integer`, become `BigDecimal`)
+
 ## [1.1.2.7][1.1.2.7]
 
 ### Changed
-* Upgrade of the used gson Dependencies from 2.8.6 to 2.8.9
-* Upgrade of the used faster-xml dependencies from 2.11.3 to 2.12.7
-* Upgrade of the used log4j dependencies from 2.17.1 to 2.18.0
+
+*   Upgrade of the used gson Dependencies from 2.8.6 to 2.8.9
+*   Upgrade of the used faster-xml dependencies from 2.11.3 to 2.12.7
+*   Upgrade of the used log4j dependencies from 2.17.1 to 2.18.0
 
 ## [1.1.2.6][1.1.2.6]
 
 ### Added
+
 *   Added Unzer-Logo and updated the reference in Readme-File.
-*   Added Json-Validation to JsonParser-Class before real Json-Deserialization happens.
+*   Added Json-Validation to JsonParser-Class before real Json-Deserialization
+    happens.
+
 *   Added Twitter-Handle to Readme-File.
 
 ### Changed
+
 *   Documentation-Link in Readme-File has been changed.
 *   Several minor improvements.
 
 ## [1.1.2.5][1.1.2.5]
 
 ### Changed
 
-*   Upgrade of the used Log4j Dependencies to fix the Log4j Zero-Day-Exploit from 2.16.0 to 2.17.0.
-*   Handling of PaymentException-Message has been changed to now return correct Message on occurrence.
+*   Upgrade of the used Log4j Dependencies to fix the Log4j Zero-Day-Exploit from
+    2.16.0 to 2.17.0.
+
+*   Handling of PaymentException-Message has been changed to now return correct
+    Message on occurrence.
+
 *   Several minor improvements.
 
 ## [1.1.2.4][1.1.2.4]
@@ -62,7 +122,9 @@ to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ### Changed
 
-*   Changed the DateTime-Handling from PAPI so that all timezones will be handled correctly in parsing and formatting.
+*   Changed the DateTime-Handling from PAPI so that all timezones will be handled
+    correctly in parsing and formatting.
+
 *   Several minor improvements.
 
 ## [1.1.2.0][1.1.2.0]
@@ -97,11 +159,14 @@ to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ### Fixed
 
-*   Fixed the Way how the PAPI-Keypairs are loaded on Unzer Object Creation and eliminated the NullPointerException which was thrown.
+*   Fixed the Way how the PAPI-Keypairs are loaded on Unzer Object Creation and
+    eliminated the NullPointerException which
+    was thrown.
 
 ### Changed
 
-*   Some Tests were failing because of missing Merchant Configuration of the used Test-Merchant.
+*   Some Tests were failing because of missing Merchant Configuration of the used
+    Test-Merchant.
 
 ## [1.1.0.0][1.1.0.0]
 
@@ -140,6 +205,8 @@ to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 *   Remove deprecated classes
     *   RestCommunication
 
+[1.2.0.0]: http://github.com/unzerdev/java-sdk/compare/1.1.2.7..1.2.0.0
+
 [1.1.2.7]: http://github.com/unzerdev/java-sdk/compare/1.1.2.6..1.1.2.7
 
 [1.1.2.6]: http://github.com/unzerdev/java-sdk/compare/1.1.2.5..1.1.2.6
@@ -162,4 +229,4 @@ to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 [1.1.0.1]: http://github.com/unzerdev/java-sdk/compare/1.1.0.0..1.1.0.1
 
-[1.1.0.0]: http://github.com/unzerdev/java-sdk/compare/c45ad44972e4a96b30b0744f5b70734f2122f142..1.1.0.0
+[1.1.0.0]: http://github.com/unzerdev/java-sdk/compare/c45ad44972e4a96b30b0744f5b70734f2122f142..1.1.0.0

.settings/.gitignore

@@ -1,33 +1,41 @@
-![Logo](unzer_logo.svg)
+![Logo](docs/images/unzer_logo.svg)
 
 # Unzer Java Payment SDK
+
 This SDK provides for an easy way to connect to the Unzer Rest API.
 
 ## Requirements
 
 Java 1.8 or later.
 
 ## Installation
+
 ```xml
 <dependency>
   <groupId>com.unzer.payment</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>1.1.2.7</version>
+  <version>1.2.0.0</version>
 </dependency>
 ```
 
 ## Documentation
+
 Documentation is available at https://docs.unzer.com/server-side-integration/java-sdk-integration/.
 
 ## SDK Overview
+
 ### Unzer class
+
 The Unzer class is instantiated using your private or public key:
+
 ```java
 Unzer unzer = new Unzer("s-priv-xxxxxxxxxx");
 ```
+
 You can inject a custom implementation of the http-network communication into the Unzer constructor. For implementing a custom communication stack, you have to subclass the AbstractUnzerRestCommunication class together with a UnzerHttpRequest. For an example please refer to the reference implementation HttpClientBasedRestCommunication.
 
 ### Authorize or Charge a payment
+
 The first step is to create a Payment Type and then do an authorize or charge for this Payment Type
 
 Example for Authorize
@@ -57,9 +65,10 @@ Charge charge = unzer.charge(BigDecimal.ONE, Currency.getInstance("EUR"), "s-sft
 Charge charge2 = unzer.charge(BigDecimal.ONE, Currency.getInstance("EUR"), new Sofort(), new URL("https://www.unzer.com"));
 ```
 
-As a result for authorize or charge an Authorization or Charge object will be returned which contains a reference to a Payment object.   
+As a result for authorize or charge an Authorization or Charge object will be returned which contains a reference to a Payment object.
 
 ### Payment status
+
 To query the status of a payment you can fetch the Payment:
 
 ```java
@@ -69,7 +78,8 @@ Payment payment = unzer.fetchPayment(authorize.getPayment().getId());
 ```
 
 ### Charge after Authorize
-If you started the payment with an authorize (reservation) then you can do a Charge based on this Authorization. 
+
+If you started the payment with an authorize (reservation) then you can do a Charge based on this Authorization.
 There are different options to Charge after an Authorization:
 
 ```java
@@ -88,6 +98,7 @@ Charge charge3 = unzer.chargeAuthorization("s-pay-1");
 ```
 
 ### Cancel an Authorize
+
 Cancelling a payment after authorization. There are again three options how to do this:
 
 ```java
@@ -105,7 +116,8 @@ Cancel cancel2 = payment.cancel(new BigDecimal(0.1));
 Cancel cancel3 = unzer.cancelAuthorization("s-pay-1");
 ```
 
-### Cancel on Charge (Refund) 
+### Cancel on Charge (Refund)
+
 Cancelling a charge refunds money from the merchant to the customer. There are several options how to do a refund:
 
 ```java
@@ -119,8 +131,8 @@ Cancel cancel = charge.cancel();
 Cancel cancel = unzer.cancelCharge("s-pay-1", "s-chg-1", BigDecimal.ONE);
 ```
 
+### Shipment
 
-### Shipment 
 To execute a Shipment you need to call the shipment method in Unzer object:
 
 ```java
@@ -130,17 +142,22 @@ Shipment shipment = unzer.shipment(authorize.getPaymentId());
 ```
 
 ## Support
+
 For any issues or questions please get in touch with our support team.
 
 ### Web page
-[https://docs.unzer.com/](https://docs.unzer.com/)
+
+<https://docs.unzer.com/>
 
 ### Email
+
 [[email protected]](mailto:[email protected])
 
 ### Phone
-* DE: [+49 6221 43101-00](tel:+4962214310100)
-* AT: [+43 1 513 66 33 669](tel:+4315136633669)
+
+*   DE: [+49 6221 43101-00](tel:+4962214310100)
+*   AT: [+43 1 513 66 33 669](tel:+4315136633669)
 
 ### Twitter
-[@UnzerTech](https://twitter.com/UnzerTech)
+
+[@UnzerTech](https://twitter.com/UnzerTech)