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

Migrate StreamFunctionConfigurationProperties

Browse Source 
Move StreamFunctionConfigurationProperties from StreamFunctionProperties
and migrate as a top-level class.
This commit is contained in:
Soby Chacko
2023-03-21 19:43:56 -04:00
parent 8e73b291f0
commit 693a4a7b60
4 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryAutoConfiguration.java
View File

@@ -45,8 +45,8 @@ import org.springframework.cloud.stream.binding.MessageChannelConfigurer;
import org.springframework.cloud.stream.binding.MessageConverterConfigurer;
import org.springframework.cloud.stream.binding.MessageSourceBindingTargetFactory;
import org.springframework.cloud.stream.binding.SubscribableChannelBindingTargetFactory;
import org.springframework.cloud.stream.function.StreamFunctionConfigurationProperties;
import org.springframework.cloud.stream.function.StreamFunctionProperties;
import org.springframework.cloud.stream.function.StreamFunctionProperties.StreamFunctionConfigurationProperties;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

1
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
View File

@@ -74,7 +74,6 @@ import org.springframework.cloud.stream.config.BinderFactoryAutoConfiguration;
import org.springframework.cloud.stream.config.BindingProperties;
import org.springframework.cloud.stream.config.BindingServiceConfiguration;
import org.springframework.cloud.stream.config.BindingServiceProperties;
import org.springframework.cloud.stream.function.StreamFunctionProperties.StreamFunctionConfigurationProperties;
import org.springframework.cloud.stream.messaging.DirectWithAttributesChannel;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;

40
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamFunctionConfigurationProperties.java Normal file
View File

@@ -0,0 +1,40 @@
/*
* Copyright 2023-2023 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.stream.function;
import java.util.HashMap;
import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* @author Oleg Zhurakousky
* @author Soby Chacko
* @since 4.0.2
*/
@ConfigurationProperties("spring.cloud.stream.function")
public class StreamFunctionConfigurationProperties {
private Map<String, String> bindings = new HashMap<>();
public Map<String, String> getBindings() {
return this.bindings;
}
public void setBindings(Map<String, String> bindings) {
this.bindings = bindings;
}
}

15
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamFunctionProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 the original author or authors.
* Copyright 2018-2023 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.
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.stream.config.BindingServiceProperties;
import org.springframework.util.StringUtils;
@@ -121,16 +120,4 @@ public class StreamFunctionProperties {
this.reactive = reactive;
}
@ConfigurationProperties("spring.cloud.stream.function")
public static class StreamFunctionConfigurationProperties {
private Map<String, String> bindings = new HashMap<>();
public Map<String, String> getBindings() {
return this.bindings;
}
public void setBindings(Map<String, String> bindings) {
this.bindings = bindings;
}
}
}