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

Split RSocket configuration from RSocketStrategiesCustomizer

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-09-08 17:29:33 +02:00
parent eccafd3278
commit f95c10337c
3 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketAutoConfiguration.java
View File

@@ -21,7 +21,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.rsocket.RSocketMessageHandlerCustomizer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.rsocket.messaging.RSocketStrategiesCustomizer;
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.cloud.function.json.JsonMapper;
@@ -29,7 +28,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.rsocket.RSocketStrategies;
import org.springframework.messaging.rsocket.RSocketStrategies.Builder;
/**
* Main configuration class for components required to support RSocket integration with
@@ -41,26 +39,10 @@ import org.springframework.messaging.rsocket.RSocketStrategies.Builder;
* @since 3.1
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties({ FunctionProperties.class, RSocketFunctionProperties.class })
@EnableConfigurationProperties(FunctionProperties.class)
@ConditionalOnProperty(name = FunctionProperties.PREFIX + ".rsocket.enabled", matchIfMissing = true)
class RSocketAutoConfiguration {
@Bean
RSocketStrategiesCustomizer rSocketStrategiesCustomizer(JsonMapper jsonMapper) {
return new RSocketStrategiesCustomizer() {
@Override
public void customize(Builder strategies) {
strategies
.encoders(encoders -> {
encoders.add(0, new MessageAwareJsonEncoder(jsonMapper, true));
})
.decoders(decoders -> {
decoders.add(0, new MessageAwareJsonDecoder(jsonMapper));
});
}
};
}
@Bean
@ConditionalOnMissingBean
@Primary

51
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/RSocketCustomizerConfiguration.java Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright 2021-2021 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.function.rsocket;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.rsocket.messaging.RSocketStrategiesCustomizer;
import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.rsocket.RSocketStrategies.Builder;
/**
* @author Oleg Zhurakousky
*
* @since 3.2
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties({ FunctionProperties.class, RSocketFunctionProperties.class })
public class RSocketCustomizerConfiguration {
@Bean
RSocketStrategiesCustomizer rSocketStrategiesCustomizer(JsonMapper jsonMapper) {
return new RSocketStrategiesCustomizer() {
@Override
public void customize(Builder strategies) {
strategies
.encoders(encoders -> {
encoders.add(0, new MessageAwareJsonEncoder(jsonMapper, true));
})
.decoders(decoders -> {
decoders.add(0, new MessageAwareJsonDecoder(jsonMapper));
});
}
};
}
}

1
spring-cloud-function-rsocket/src/main/resources/META-INF/spring.factories
View File

@@ -1,3 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.function.rsocket.RSocketAutoConfiguration,\
org.springframework.cloud.function.rsocket.RSocketCustomizerConfiguration,\
org.springframework.cloud.function.rsocket.RSocketRoutingAutoConfiguration