Skip to content

Fix handling transformers properties. #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2021
Merged

Fix handling transformers properties. #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions ...va/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
import org.springframework.cloud.loadbalancer.config.XForwardedConfigurationCondition;
import org.springframework.cloud.loadbalancer.core.ReactorLoadBalancer;
import org.springframework.cloud.loadbalancer.core.RetryAwareServiceInstanceListSupplier;
import org.springframework.cloud.loadbalancer.core.RoundRobinLoadBalancer;
Expand Down Expand Up @@ -100,7 +99,6 @@ public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceL
@Bean
@ConditionalOnBean({ XForwardedHeadersTransformer.class, LoadBalancerClientFactory.class })
@ConditionalOnMissingBean
@Conditional(XForwardedConfigurationCondition.class)
public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerClientFactory clientFactory) {
return new XForwardedHeadersTransformer(clientFactory);
}
Expand Down
17 changes: 0 additions & 17 deletions ...pringframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,8 @@
import org.springframework.cloud.loadbalancer.blocking.retry.BlockingLoadBalancedRetryFactory;
import org.springframework.cloud.loadbalancer.core.LoadBalancerServiceInstanceCookieTransformer;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.loadbalancer.support.LoadBalancerEnvironmentPropertyUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.retry.support.RetryTemplate;
import org.springframework.web.client.RestTemplate;

Expand All @@ -68,15 +63,13 @@ public LoadBalancerClient blockingLoadBalancerClient(LoadBalancerClientFactory l
}

@Bean
@Conditional(AddServiceInstanceCookieCondition.class)
@ConditionalOnMissingBean(LoadBalancerServiceInstanceCookieTransformer.class)
public LoadBalancerServiceInstanceCookieTransformer loadBalancerServiceInstanceCookieTransformer(
LoadBalancerProperties properties) {
return new LoadBalancerServiceInstanceCookieTransformer(properties.getStickySession());
}

@Bean
@Conditional(XForwardedConfigurationCondition.class)
@ConditionalOnMissingBean(XForwardedHeadersTransformer.class)
@ConditionalOnBean(LoadBalancerClientFactory.class)
public XForwardedHeadersTransformer xForwarderHeadersTransformer(
Expand All @@ -98,14 +91,4 @@ LoadBalancedRetryFactory loadBalancedRetryFactory(

}

static class AddServiceInstanceCookieCondition implements Condition {

@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
return LoadBalancerEnvironmentPropertyUtils.trueForClientOrDefault(context.getEnvironment(),
"sticky-session.add-service-instance-cookie");
}

}

}
38 changes: 0 additions & 38 deletions .../java/org/springframework/cloud/loadbalancer/config/XForwardedConfigurationCondition.java
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...springframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public HttpRequest transformRequest(HttpRequest request, ServiceInstance instanc
}
LoadBalancerProperties.StickySession stickySession = factory != null
? factory.getProperties(instance.getServiceId()).getStickySession() : stickySessionProperties;
if (!stickySession.isAddServiceInstanceCookie()) {
return request;
}
String instanceIdCookieName = stickySession.getInstanceIdCookieName();
if (!StringUtils.hasText(instanceIdCookieName)) {
return request;
Expand Down
6 changes: 6 additions & 0 deletions ...gframework/cloud/loadbalancer/core/LoadBalancerServiceInstanceCookieTransformerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.cloud.loadbalancer.core;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import org.springframework.cloud.client.DefaultServiceInstance;
Expand Down Expand Up @@ -43,6 +44,11 @@ class LoadBalancerServiceInstanceCookieTransformerTests {

HttpRequest request = new MockClientHttpRequest();

@BeforeEach
void setUp() {
stickySessionProperties.setAddServiceInstanceCookie(true);
}

@Test
void shouldAddServiceInstanceCookieHeader() {
HttpRequest newRequest = transformer.transformRequest(request, serviceInstance);
Expand Down