SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.1.x' into 4.2.x

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2025-04-11 17:16:55 +02:00
parent 6f2a0d94d6 a83b194e30
commit 6ddb081f70
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import java.util.stream.Stream;
import feign.Client;
import feign.Feign;
import feign.Logger;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -65,7 +64,7 @@ class FeignBuilderCustomizerTests {
FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
clientFactoryBean.getTarget();
Assertions.assertNotNull(feignBuilderCaptor.getValue());
assertThat(feignBuilderCaptor.getValue()).isNotNull();
Feign.Builder builder = feignBuilderCaptor.getValue();
assertFeignBuilderField(builder, "logLevel", Logger.Level.HEADERS);
assertFeignBuilderField(builder, "dismiss404", true);
@@ -92,7 +91,7 @@ class FeignBuilderCustomizerTests {
FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
clientFactoryBean.getTarget();
Assertions.assertNotNull(feignBuilderCaptor.getValue());
assertThat(feignBuilderCaptor.getValue()).isNotNull();
Feign.Builder builder = feignBuilderCaptor.getValue();
assertFeignBuilderField(builder, "logLevel", Logger.Level.FULL);
assertFeignBuilderField(builder, "dismiss404", true);
@@ -113,7 +112,7 @@ class FeignBuilderCustomizerTests {
clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode);
clientFactoryBean.getTarget();
Assertions.assertNotNull(feignBuilderCaptor.getValue());
assertThat(feignBuilderCaptor.getValue()).isNotNull();
Feign.Builder builder = feignBuilderCaptor.getValue();
assertFeignBuilderField(builder, "logLevel", Logger.Level.BASIC);
assertFeignBuilderField(builder, "dismiss404", true);
@@ -134,7 +133,7 @@ class FeignBuilderCustomizerTests {
clientFactoryBean.addCustomizer(builder -> builder.client(customClientMock));
clientFactoryBean.getTarget();
Assertions.assertNotNull(feignBuilderCaptor.getValue());
assertThat(feignBuilderCaptor.getValue()).isNotNull();
Feign.Builder builder = feignBuilderCaptor.getValue();
assertFeignBuilderField(builder, "client", customClientMock);

18
spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/AbstractFormWriterTests.java → spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FormWriterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,29 +16,31 @@
package org.springframework.cloud.openfeign.support;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Wu Daifu
* @author Olga Maciaszek-Sharma
*/
class AbstractFormWriterTests {
class FormWriterTests {
@Test
void shouldCorrectlyResolveIfApplicableForCollection() {
MockFormWriter formWriter = new MockFormWriter();
Object object = new Object();
Assertions.assertFalse(formWriter.isApplicable(object));
assertThat(formWriter.isApplicable(object)).isFalse();
object = new Object[] { new Object(), new Object() };
Assertions.assertFalse(formWriter.isApplicable(object));
assertThat(formWriter.isApplicable(object)).isFalse();
object = new UserPojo();
Assertions.assertTrue(formWriter.isApplicable(object));
assertThat(formWriter.isApplicable(object)).isTrue();
object = new UserPojo[] { new UserPojo(), new UserPojo() };
Assertions.assertTrue(formWriter.isApplicable(object));
assertThat(formWriter.isApplicable(object)).isTrue();
object = new byte[] { '1', '2' };
Assertions.assertFalse(formWriter.isApplicable(object));
assertThat(formWriter.isApplicable(object)).isFalse();
}
static class MockFormWriter extends AbstractFormWriter {