From b3237f3eb664cc409b9e7a8f8844594126b7b1b0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 1 Dec 2019 00:41:53 +0100 Subject: [PATCH] Polishing --- .../factory/groovy/GroovyBeanDefinitionReader.java | 11 ++++------- .../client/DefaultExchangeStrategiesBuilder.java | 5 ++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index ef6d5c6731..bdfb2d05ba 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -310,7 +310,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp GroovyBeanDefinitionWrapper current = this.currentBeanDefinition; try { Closure callable = null; - Collection constructorArgs = null; + Collection constructorArgs = null; if (!ObjectUtils.isEmpty(args)) { int index = args.length; Object lastArg = args[index - 1]; @@ -318,16 +318,13 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp callable = (Closure) lastArg; index--; } - if (index > -1) { - constructorArgs = resolveConstructorArguments(args, 0, index); - } + constructorArgs = resolveConstructorArguments(args, 0, index); } this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(null, type, constructorArgs); if (callable != null) { callable.call(this.currentBeanDefinition); } return this.currentBeanDefinition.getBeanDefinition(); - } finally { this.currentBeanDefinition = current; @@ -810,7 +807,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp return retVal; } - public boolean addAll(Collection values) { + public boolean addAll(Collection values) { boolean retVal = (Boolean) InvokerHelper.invokeMethod(this.propertyValue, "addAll", values); for (Object value : values) { updateDeferredProperties(value); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java index 02b0cc5e55..e39d4a5957 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java @@ -29,6 +29,7 @@ import org.springframework.http.codec.HttpMessageWriter; * Default implementation of {@link ExchangeStrategies.Builder}. * * @author Arjen Poutsma + * @author Brian Clozel * @since 5.0 */ final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Builder { @@ -79,7 +80,6 @@ final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Build private final List> writers; - public DefaultExchangeStrategies(ClientCodecConfigurer codecConfigurer) { this.codecConfigurer = codecConfigurer; this.readers = unmodifiableCopy(this.codecConfigurer.getReaders()); @@ -90,9 +90,8 @@ final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Build return Collections.unmodifiableList(new ArrayList<>(list)); } - - @Override @Deprecated + @Override public Builder mutate() { return new DefaultExchangeStrategiesBuilder(this); }