ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1141 hutool6.x javaEE xml soap、javaEE xml jaxb全部启用jakartaEE，涉及工具类JAXBUtil、SoapClient

Browse Source 
Merge pull request !1141 from dazer007/v6-dev-jakartaee-jaxb
This commit is contained in:
Looly 2023-12-28 13:26:10 +00:00 committed by Gitee
commit 05e85ebce0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hutool-extra/pom.xml
View File

@ -505,10 +505,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!--JAXB (JSR 222) JAXBUtil javax.xml.bind xml相关依赖, 从javaEE（javax.xml.bind）变成jakartaEE（jakarta.xml.bind） -->
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.7</version> <version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -517,11 +518,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- JAXB (JSR 222) Reference Implementation -->
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>org.glassfish.jaxb</groupId>
<artifactId>activation</artifactId> <artifactId>jaxb-runtime</artifactId>
<version>1.1.1</version> <version>3.0.2</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

14
hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
View File

@ -19,13 +19,13 @@ import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.core.xml.XmlUtil; import org.dromara.hutool.core.xml.XmlUtil;
import javax.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller; import jakarta.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller; import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper; import jakarta.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlTransient;
import java.io.File; import java.io.File;
import java.io.Reader; import java.io.Reader;
import java.io.StringWriter; import java.io.StringWriter;

2
hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
View File

@ -12,10 +12,10 @@
package org.dromara.hutool.extra.xml; package org.dromara.hutool.extra.xml;
import jakarta.xml.bind.annotation.*;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import javax.xml.bind.annotation.*;
/** /**
* {@link JAXBUtil} 工具类 * {@link JAXBUtil} 工具类

13
hutool-http/pom.xml
View File

@ -43,10 +43,17 @@
<artifactId>hutool-log</artifactId> <artifactId>hutool-log</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
<!-- webservice SOAP， 从javaEE变成jakartaEE（javax.xml.soap） Jakarta XML SOAP(jakarta.xml.soap) -->
<dependency> <dependency>
<groupId>javax.xml.soap</groupId> <groupId>jakarta.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId> <artifactId>jakarta.xml.soap-api</artifactId>
<version>1.4.0</version> <version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>2.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java
View File

@ -26,7 +26,7 @@ import org.dromara.hutool.http.client.Response;
import javax.xml.XMLConstants; import javax.xml.XMLConstants;
import javax.xml.namespace.QName; import javax.xml.namespace.QName;
import javax.xml.soap.*; import jakarta.xml.soap.*;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;

2
hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.http.webservice; package org.dromara.hutool.http.webservice;
import javax.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPConstants;
/** /**
* SOAP协议版本枚举 * SOAP协议版本枚举

4
hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
View File

@ -17,8 +17,8 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import javax.xml.soap.SOAPException; import jakarta.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage; import jakarta.xml.soap.SOAPMessage;
import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.util.CharsetUtil;

6
hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java
View File

@ -17,8 +17,8 @@ import org.dromara.hutool.core.util.CharsetUtil;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import javax.xml.soap.SOAPException; import jakarta.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage; import jakarta.xml.soap.SOAPMessage;
/** /**
* SOAP相关单元测试 * SOAP相关单元测试
@ -32,7 +32,7 @@ public class SoapClientTest {
@Disabled @Disabled
public void requestTest() { public void requestTest() {
final SoapClient client = SoapClient.of("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") final SoapClient client = SoapClient.of("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx")
.setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/") .setMethod("getCountryCityByIp", "http://WebXml.com.cn/")
.charset(CharsetUtil.GBK) .charset(CharsetUtil.GBK)
.setParam("theIpAddress", "218.21.240.106"); .setParam("theIpAddress", "218.21.240.106");