Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gson/src/test/java/feign/gson/GsonCodecTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ void encodesMapObjectNumericalValuesAsInteger() {
new GsonEncoder().encode(map, map.getClass(), template);

assertThat(template)
.hasBody("""
.hasBody(
"""
{
"foo": 1
}\
Expand Down
4 changes: 2 additions & 2 deletions jaxb-jakarta/src/test/java/feign/jaxb/JAXBCodecTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void encodesXmlWithCustomJAXBNoNamespaceSchemaLocation() throws Exception {

assertThat(template)
.hasBody(
"""
"""
<?xml version="1.0" encoding="UTF-8" \
standalone="yes"?><mockObject xsi:noNamespaceSchemaLocation="http://apihost/schema.xsd" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\
Expand Down Expand Up @@ -420,7 +420,7 @@ public int hashCode() {

private static Schema getMockIntObjSchema() throws Exception {
String schema =
"""
"""
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">\
<xs:element name="mockIntObject" type="mockIntObject"/><xs:complexType name="mockIntObject">\
Expand Down
4 changes: 2 additions & 2 deletions jaxb/src/test/java/feign/jaxb/JAXBCodecTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void encodesXmlWithCustomJAXBNoNamespaceSchemaLocation() throws Exception {

assertThat(template)
.hasBody(
"""
"""
<?xml version="1.0" encoding="UTF-8" \
standalone="yes"?><mockObject xsi:noNamespaceSchemaLocation="http://apihost/schema.xsd" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\
Expand Down Expand Up @@ -421,7 +421,7 @@ public int hashCode() {

private static Schema getMockIntObjSchema() throws Exception {
String schema =
"""
"""
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">\
<xs:element name="mockIntObject" type="mockIntObject"/><xs:complexType name="mockIntObject">\
Expand Down
3 changes: 2 additions & 1 deletion moshi/src/test/java/feign/moshi/MoshiEncoderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ void encodesMapObjectNumericalValuesAsInteger() {
new MoshiEncoder().encode(map, Map.class, template);

assertThat(template)
.hasBody("""
.hasBody(
"""
{
"foo": 1
}\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<fastjson2.version>2.0.58</fastjson2.version>
<jsonassert.version>1.5.3</jsonassert.version>

<git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
<git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion sax/src/test/java/feign/sax/SAXDecoderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class SAXDecoderTest {

static String statusFailed =
"""
"""
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
<soap:Body>
<ns1:getNeustarNetworkStatusResponse xmlns:ns1="http://webservice.api.ultra.neustar.com/v01/">
Expand Down
10 changes: 5 additions & 5 deletions soap-jakarta/src/test/java/feign/soap/SOAPCodecTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void encodesSoapWithCustomJAXBSchemaLocation() {

assertThat(template)
.hasBody(
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down Expand Up @@ -180,7 +180,7 @@ void encodesSoapWithCustomJAXBNoSchemaLocation() {

assertThat(template)
.hasBody(
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down Expand Up @@ -238,7 +238,7 @@ void decodesSoap() throws Exception {
mock.item.value = "Apples";

String mockSoapEnvelop =
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down Expand Up @@ -272,7 +272,7 @@ void decodesSoapWithSchemaOnEnvelope() throws Exception {
mock.item.value = "Apples";

String mockSoapEnvelop =
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://apihost/schema.xsd" \
Expand Down Expand Up @@ -312,7 +312,7 @@ void decodesSoap1_2Protocol() throws Exception {
mock.item.value = "Apples";

String mockSoapEnvelop =
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down
10 changes: 5 additions & 5 deletions soap/src/test/java/feign/soap/SOAPCodecTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void encodesSoapWithCustomJAXBSchemaLocation() {

assertThat(template)
.hasBody(
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down Expand Up @@ -180,7 +180,7 @@ void encodesSoapWithCustomJAXBNoSchemaLocation() {

assertThat(template)
.hasBody(
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down Expand Up @@ -238,7 +238,7 @@ void decodesSoap() throws Exception {
mock.item.value = "Apples";

String mockSoapEnvelop =
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down Expand Up @@ -272,7 +272,7 @@ void decodesSoapWithSchemaOnEnvelope() throws Exception {
mock.item.value = "Apples";

String mockSoapEnvelop =
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://apihost/schema.xsd" \
Expand Down Expand Up @@ -312,7 +312,7 @@ void decodesSoap1_2Protocol() throws Exception {
mock.item.value = "Apples";

String mockSoapEnvelop =
"""
"""
<?xml version="1.0" encoding="UTF-8" ?>\
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">\
<SOAP-ENV:Header/>\
Expand Down