Merge pull request #17834 from succezlijunyi

* pr/17834:
  Simplify some code

Closes gh-17834
pull/17847/head
Stephane Nicoll 5 years ago
commit a37b8ede3a

@ -65,8 +65,7 @@ class RequestPredicateFactory {
private Parameter getAllRemainingPathSegmentsParameter(Parameter[] selectorParameters) { private Parameter getAllRemainingPathSegmentsParameter(Parameter[] selectorParameters) {
Parameter trailingPathsParameter = null; Parameter trailingPathsParameter = null;
for (int i = 0; i < selectorParameters.length; i++) { for (Parameter selectorParameter : selectorParameters) {
Parameter selectorParameter = selectorParameters[i];
Selector selector = selectorParameter.getAnnotation(Selector.class); Selector selector = selectorParameter.getAnnotation(Selector.class);
if (selector.match() == Match.ALL_REMAINING) { if (selector.match() == Match.ALL_REMAINING) {
Assert.state(trailingPathsParameter == null, Assert.state(trailingPathsParameter == null,

@ -97,8 +97,7 @@ class ShutdownEndpointTests {
@Bean @Bean
ShutdownEndpoint endpoint() { ShutdownEndpoint endpoint() {
ShutdownEndpoint endpoint = new ShutdownEndpoint(); return new ShutdownEndpoint();
return endpoint;
} }
@Bean @Bean

@ -124,9 +124,7 @@ class DiscoveredJmxOperationTests {
annotationAttributes.put("produces", "application/xml"); annotationAttributes.put("produces", "application/xml");
DiscoveredOperationMethod operationMethod = new DiscoveredOperationMethod(method, OperationType.READ, DiscoveredOperationMethod operationMethod = new DiscoveredOperationMethod(method, OperationType.READ,
annotationAttributes); annotationAttributes);
DiscoveredJmxOperation operation = new DiscoveredJmxOperation(EndpointId.of("test"), operationMethod, return new DiscoveredJmxOperation(EndpointId.of("test"), operationMethod, mock(OperationInvoker.class));
mock(OperationInvoker.class));
return operation;
} }
private Method findMethod(String methodName) { private Method findMethod(String methodName) {

Loading…
Cancel
Save