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

ChannelsEndpoint should return a Map<> (not a domain object)

Browse Source 
This is a general rule for endpoints so they work OOTB with JMX.
This commit is contained in:
Dave Syer
2015-10-20 07:59:13 -04:00
committed by Mark Fisher
parent f51cc43d52
commit 5eaba5811c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/ChannelBindingService.java
View File

@@ -137,12 +137,12 @@ public class ChannelBindingService implements InitializingBean {
catch (Exception e) {
throw new IllegalStateException("Could not get the message channel to configure message converters" + e);
}
BindingProperties bindingProperties = channelBindingServiceProperties.getBindings().get(channelName);
BindingProperties bindingProperties = this.channelBindingServiceProperties.getBindings().get(channelName);
if (bindingProperties != null) {
String contentType = bindingProperties.getContentType();
if (StringUtils.hasText(contentType)) {
MimeType mimeType = MessageConverterUtils.getMimeType(contentType);
MessageConverter messageConverter = messageConverterFactory.newInstance(mimeType);
MessageConverter messageConverter = this.messageConverterFactory.newInstance(mimeType);
Class<?> dataType = MessageConverterUtils.getJavaTypeForContentType(mimeType,
Thread.currentThread().getContextClassLoader());
messageChannel.setDatatypes(dataType);

12
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/endpoint/ChannelsEndpoint.java
View File

@@ -24,17 +24,16 @@ import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import org.springframework.cloud.stream.binding.Bindable;
import org.springframework.cloud.stream.config.BindingProperties;
import org.springframework.cloud.stream.config.ChannelBindingServiceProperties;
import org.springframework.cloud.stream.endpoint.ChannelsEndpoint.ChannelsMetaData;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
* @author Dave Syer
*/
@RestController
public class ChannelsEndpoint extends AbstractEndpoint<ChannelsMetaData> {
public class ChannelsEndpoint extends AbstractEndpoint<Map<String,Object>> {
private List<Bindable> adapters;
@@ -48,7 +47,7 @@ public class ChannelsEndpoint extends AbstractEndpoint<ChannelsMetaData> {
}
@Override
public ChannelsMetaData invoke() {
public Map<String,Object> invoke() {
ChannelsMetaData map = new ChannelsMetaData();
Map<String, BindingProperties> inputs = map.getInputs();
Map<String, BindingProperties> outputs = map.getOutputs();
@@ -63,7 +62,8 @@ public class ChannelsEndpoint extends AbstractEndpoint<ChannelsMetaData> {
: new BindingProperties());
}
}
return map;
return new ObjectMapper().convertValue(map, new TypeReference<Map<String,Object>>() {
});
}
@JsonInclude(value = Include.NON_DEFAULT)