Merge pull request #1 from mpay24/java-sdk17

Upgrade to Java 17
mpay24 · Apr 26, 2024 · c3930d0 · c3930d0
2 parents 501855d + 394a6ec
commit c3930d0
Show file tree

Hide file tree

Showing 48 changed files with 436 additions and 661 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -3,14 +3,14 @@ Offical mPAY24 Java Payment SDK
 
 ## Requirements
 
-Java 1.6 or later.
+Java 17 or later.
 
 ## Installation
 ```xml
 <dependency>
     <groupId>com.mpay24.payment</groupId>
     <artifactId>mpay24-payment-sdk</artifactId>
-    <version>1.2.0.0</version>
+    <version>1.10.0.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -14,8 +14,10 @@
 	<url>https://docs.mpay24.com</url>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
 	<licenses>
@@ -57,7 +59,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.10.4</version>
-				<configuration></configuration>
 			</plugin>
 		</plugins>
 	</reporting>
@@ -85,7 +86,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.6.3</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -134,44 +135,28 @@
 				</configuration>
 			</plugin>
 		</plugins>
-
-		<!--This plugin's configuration is used to store Eclipse m2e settings only.
-			It has no influence on the Maven build itself. -->
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.felix</groupId>
-										<artifactId>maven-bundle-plugin</artifactId>
-										<versionRange>2.3.6</versionRange>
-										<goals>
-											<goal>manifest</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.mpay24.payment</groupId>
 			<artifactId>mpay24-soap-client</artifactId>
-			<version>1.5.8.0</version>
+			<version>1.6.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.3.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
@@ -184,12 +169,6 @@
 			<version>2.17.1</version>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>jaxws-api</artifactId>
-			<version>2.2.3</version>
-		</dependency>
-
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -201,7 +180,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>3.4.0</version>
+			<version>3.141.59</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/com/mpay24/payment/Mpay24.java b/src/main/java/com/mpay24/payment/Mpay24.java
@@ -1,31 +1,23 @@
 package com.mpay24.payment;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.mpay.soap.client.Address;
-import com.mpay.soap.client.Order;
-import com.mpay.soap.client.PaymentType;
-import com.mpay.soap.client.SortField;
-import com.mpay.soap.client.SortType;
 import com.mpay24.payment.communication.SoapCommunication;
-import com.mpay24.payment.data.Customer;
 import com.mpay24.payment.data.Payment;
 import com.mpay24.payment.data.PaymentData;
-import com.mpay24.payment.data.PaymentRequest;
-import com.mpay24.payment.data.Refund;
 import com.mpay24.payment.data.ShoppingCart;
-import com.mpay24.payment.data.StylingOptions;
-import com.mpay24.payment.data.Token;
-import com.mpay24.payment.data.TokenRequest;
+import com.mpay24.payment.data.*;
 import com.mpay24.payment.mapper.SdkApiObjectMapper;
 import com.mpay24.payment.mapper.SdkMdxiMapper;
 import com.mpay24.payment.type.PaymentTypeData;
+import com.mpay24.soap.Address;
+import com.mpay24.soap.PaymentType;
+import com.mpay24.soap.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.List;
 
 public class Mpay24 {
 
@@ -105,7 +97,7 @@ public Payment payment(PaymentRequest paymentRequest, PaymentTypeData paymentTyp
 		return payment(paymentRequest, paymentTypeData, customer, null);
 	}
 	public Payment payment(PaymentRequest paymentRequest, PaymentTypeData paymentTypeData, Customer customer, ShoppingCart shoppingCart) throws PaymentException {
-		com.mpay.soap.client.Payment payment = mapper.mapPaymentSystemData(paymentRequest, paymentTypeData);
+		com.mpay24.soap.Payment payment = mapper.mapPaymentSystemData(paymentRequest, paymentTypeData);
 		Order order = mapper.mapOrder(paymentRequest, customer, shoppingCart);
 
 		return soapCommunication.acceptPayment(paymentRequest.getTransactionID(), paymentTypeData.getPaymentType(), payment,
@@ -184,15 +176,15 @@ public void createCustomer(Customer customer, PaymentTypeData paymentTypeData) t
 	}
 	public void createCustomer(Customer customer, String profileId, PaymentTypeData paymentTypeData) throws PaymentException {
 		PaymentType paymentType = mapper.mapPaymentTypeData(paymentTypeData);
-		com.mpay.soap.client.PaymentData paymentData = mapper.mapPaymentData(paymentTypeData, profileId);
+		com.mpay24.soap.PaymentData paymentData = mapper.mapPaymentData(paymentTypeData, profileId);
 		Address address = mapper.mapCustomer(customer);
 		soapCommunication.createCustomer(customer.getCustomerId(), customer.getName(), address, paymentType, paymentData);
 	}
 
 	public Payment createCustomer(Customer customer, String profileId, PaymentTypeData paymentTypeData, PaymentRequest paymentRequest, boolean validate) throws PaymentException {
 		PaymentType paymentType = mapper.mapPaymentTypeData(paymentTypeData);
 		Order order = mapper.mapOrder(paymentRequest, customer, null);
-		com.mpay.soap.client.PaymentData paymentData = mapper.mapPaymentData(paymentTypeData, profileId);
+		com.mpay24.soap.PaymentData paymentData = mapper.mapPaymentData(paymentTypeData, profileId);
 		Address address = mapper.mapCustomer(customer);
 		paymentData.setValidate(validate);
 		return soapCommunication.createCustomer(customer.getCustomerId(), customer.getName(), address, paymentType, paymentData, paymentRequest.getTransactionID(), order, paymentRequest.getSuccessUrl(), paymentRequest.getErrorUrl(),

diff --git a/src/main/java/com/mpay24/payment/PaymentException.java b/src/main/java/com/mpay24/payment/PaymentException.java
@@ -1,6 +1,6 @@
 package com.mpay24.payment;
 
-import com.mpay.soap.client.Status;
+import com.mpay24.soap.Status;
 
 public class PaymentException extends Exception {
 	private static final long serialVersionUID = -8356132170233002179L;