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

GH-1286 Reworked 'bindings' endpoint (#1288)

Browse Source 
* GH-1286 Reworked 'bindings' endpoint

* polishing
This commit is contained in:
Oleg Zhurakousky
2018-03-07 12:32:34 -05:00
committed by Soby Chacko
parent f05811c4f6
commit e939e09e95
3 changed files with 46 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@@ -148,6 +148,15 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerArgument>-parameters</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>

23
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java
View File

@@ -39,29 +39,8 @@ import org.springframework.context.annotation.Configuration;
@AutoConfigureAfter(EndpointAutoConfiguration.class)
public class BindingsEndpointAutoConfiguration {
@Bean
@Bean
public BindingsEndpoint bindingsEndpoint(List<InputBindingLifecycle> inputBindings) {
return new BindingsEndpoint(inputBindings);
}
@Bean
public BindingsEndpoint.StopEndpoint stopEndpoint(BindingsEndpoint bindingEndpoint) {
return bindingEndpoint.getStopEndpoint();
}
@Bean
public BindingsEndpoint.PauseEndpoint pauseEndpoint(BindingsEndpoint bindingEndpoint) {
return bindingEndpoint.getPauseEndpoint();
}
@Bean
public BindingsEndpoint.StartEndpoint startEndpoint(BindingsEndpoint bindingEndpoint) {
return bindingEndpoint.getStartEndpoint();
}
@Bean
public BindingsEndpoint.ResumeEndpoint resumeEndpoint(BindingsEndpoint bindingEndpoint) {
return bindingEndpoint.getResumeEndpoint();
}
}

110
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/endpoint/BindingsEndpoint.java
View File

@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.Selector;
import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
import org.springframework.cloud.stream.binder.Binding;
import org.springframework.cloud.stream.binding.InputBindingLifecycle;
@@ -39,19 +40,9 @@ import org.springframework.util.Assert;
* @since 2.0
*
*/
@Endpoint(id = BindingsEndpoint.BASE_ENPOINT_ID)
@Endpoint(id = "bindings")
public class BindingsEndpoint {
static final String BASE_ENPOINT_ID = "bindings";
static final String START_ENPOINT_ID = BASE_ENPOINT_ID + "/start/{name}";
static final String STOP_ENPOINT_ID = BASE_ENPOINT_ID + "/stop/{name}";
static final String PAUSE_ENPOINT_ID = BASE_ENPOINT_ID + "/pause/{name}";
static final String RESUME_ENPOINT_ID = BASE_ENPOINT_ID + "/resume/{name}";
private final List<InputBindingLifecycle> inputBindingLifecycles;
private final ObjectMapper objectMapper;
@@ -62,25 +53,38 @@ public class BindingsEndpoint {
this.objectMapper = new ObjectMapper();
}
@WriteOperation
public void changeState(@Selector String name, State state) {
Binding<?> binding = BindingsEndpoint.this.locateBinding(name);
if (binding != null) {
switch (state) {
case STARTED:
binding.start();
break;
case STOPPED:
binding.stop();
break;
case PAUSED:
binding.pause();
break;
case RESUMED:
binding.resume();
break;
default:
break;
}
}
}
@ReadOperation
public List<?> bindings() {
return this.objectMapper.convertValue(this.gatherInputBindings(), List.class);
public List<?> queryStates() {
return objectMapper.convertValue(gatherInputBindings(), List.class);
}
public StopEndpoint getStopEndpoint() {
return new StopEndpoint();
}
public StartEndpoint getStartEndpoint() {
return new StartEndpoint();
}
public PauseEndpoint getPauseEndpoint() {
return new PauseEndpoint();
}
public ResumeEndpoint getResumeEndpoint() {
return new ResumeEndpoint();
@ReadOperation
public Binding<?> queryState(@Selector String name) {
Assert.notNull(name, "'name' must not be null");
return this.locateBinding(name);
}
@SuppressWarnings("unchecked")
@@ -101,52 +105,10 @@ public class BindingsEndpoint {
.orElse(null);
}
@Endpoint(id = BindingsEndpoint.STOP_ENPOINT_ID)
public class StopEndpoint {
@WriteOperation
public boolean stop(String name) {
Binding<?> binding = BindingsEndpoint.this.locateBinding(name);
if (binding != null) {
binding.stop();
}
return binding != null;
}
private enum State {
STARTED,
STOPPED,
PAUSED,
RESUMED;
}
@Endpoint(id = BindingsEndpoint.PAUSE_ENPOINT_ID)
public class PauseEndpoint {
@WriteOperation
public boolean pause(String name) {
Binding<?> binding = BindingsEndpoint.this.locateBinding(name);
if (binding != null) {
binding.pause();
}
return binding != null;
}
}
@Endpoint(id = BindingsEndpoint.START_ENPOINT_ID)
public class StartEndpoint {
@WriteOperation
public boolean start(String name) {
Binding<?> binding = BindingsEndpoint.this.locateBinding(name);
if (binding != null) {
binding.start();
}
return binding != null;
}
}
@Endpoint(id = BindingsEndpoint.RESUME_ENPOINT_ID)
public class ResumeEndpoint {
@WriteOperation
public boolean resume(String name) {
Binding<?> binding = BindingsEndpoint.this.locateBinding(name);
if (binding != null) {
binding.resume();
}
return binding != null;
}
}
}