Skip to content

Commit c55446d

Browse files
jhoellerunknown
jhoeller
authored and
unknown
committed
Polishing
1 parent 9b6ec5b commit c55446d

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

‎spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ class ComponentScanAnnotationParser {
5454
private final BeanNameGenerator beanNameGenerator;
5555

5656

57-
public ComponentScanAnnotationParser(
58-
ResourceLoader resourceLoader, Environment environment,
57+
public ComponentScanAnnotationParser(ResourceLoader resourceLoader, Environment environment,
5958
BeanNameGenerator beanNameGenerator, BeanDefinitionRegistry registry) {
6059

6160
this.resourceLoader = resourceLoader;
@@ -67,7 +66,7 @@ public ComponentScanAnnotationParser(
6766

6867
public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, String declaringClass) {
6968
ClassPathBeanDefinitionScanner scanner =
70-
new ClassPathBeanDefinitionScanner(registry, componentScan.getBoolean("useDefaultFilters"));
69+
new ClassPathBeanDefinitionScanner(this.registry, componentScan.getBoolean("useDefaultFilters"));
7170

7271
Assert.notNull(this.environment, "Environment must not be null");
7372
scanner.setEnvironment(this.environment);
@@ -77,14 +76,14 @@ public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, Strin
7776

7877
Class<? extends BeanNameGenerator> generatorClass = componentScan.getClass("nameGenerator");
7978
boolean useInheritedGenerator = BeanNameGenerator.class.equals(generatorClass);
80-
scanner.setBeanNameGenerator(useInheritedGenerator
81-
? this.beanNameGenerator
82-
: BeanUtils.instantiateClass(generatorClass));
79+
scanner.setBeanNameGenerator(useInheritedGenerator ? this.beanNameGenerator :
80+
BeanUtils.instantiateClass(generatorClass));
8381

8482
ScopedProxyMode scopedProxyMode = componentScan.getEnum("scopedProxy");
8583
if (scopedProxyMode != ScopedProxyMode.DEFAULT) {
8684
scanner.setScopedProxyMode(scopedProxyMode);
87-
} else {
85+
}
86+
else {
8887
Class<? extends ScopeMetadataResolver> resolverClass = componentScan.getClass("scopeResolver");
8988
scanner.setScopeMetadataResolver(BeanUtils.instantiateClass(resolverClass));
9089
}
@@ -121,7 +120,7 @@ public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, Strin
121120
basePackages.add(ClassUtils.getPackageName(declaringClass));
122121
}
123122

124-
return scanner.doScan(basePackages.toArray(new String[]{}));
123+
return scanner.doScan(StringUtils.toStringArray(basePackages));
125124
}
126125

127126
private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
@@ -153,4 +152,5 @@ private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
153152
}
154153
return typeFilters;
155154
}
155+
156156
}

‎spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.Map;
2929
import java.util.regex.Matcher;
3030
import java.util.regex.Pattern;
31-
3231
import javax.servlet.http.HttpServletRequest;
3332
import javax.servlet.http.HttpServletResponse;
3433

@@ -77,10 +76,6 @@
7776
*
7877
* <p><b>NOTE when using this redirect view in a Portlet environment:</b> Make sure
7978
* that your controller respects the Portlet <code>sendRedirect</code> constraints.
80-
* When e.g. using {@link org.springframework.web.portlet.mvc.SimpleFormController},
81-
* make sure to set your controller's
82-
* {@link org.springframework.web.portlet.mvc.AbstractFormController#setRedirectAction "redirectAction"}
83-
* property to "true", in order to make the controller base class behave accordingly.
8479
*
8580
* @author Rod Johnson
8681
* @author Juergen Hoeller
@@ -97,6 +92,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
9792

9893
private static final Pattern URI_TEMPLATE_VARIABLE_PATTERN = Pattern.compile("\\{([^/]+?)\\}");
9994

95+
10096
private boolean contextRelative = false;
10197

10298
private boolean http10Compatible = true;
@@ -109,6 +105,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
109105

110106
private boolean expandUriTemplateVariables = true;
111107

108+
112109
/**
113110
* Constructor for use as a bean.
114111
*/
@@ -233,7 +230,6 @@ public void setStatusCode(HttpStatus statusCode) {
233230
* and close curly braces "{", "}" and you don't want them interpreted
234231
* as URI variables.
235232
* <p>Defaults to <code>true</code>.
236-
* @param expandUriTemplateVariables
237233
*/
238234
public void setExpandUriTemplateVariables(boolean expandUriTemplateVariables) {
239235
this.expandUriTemplateVariables = expandUriTemplateVariables;
@@ -265,7 +261,6 @@ protected void renderMergedOutputModel(
265261
throws IOException {
266262

267263
String targetUrl = createTargetUrl(model, request);
268-
269264
targetUrl = updateTargetUrl(targetUrl, model, request, response);
270265

271266
FlashMap flashMap = RequestContextUtils.getOutputFlashMap(request);
@@ -278,7 +273,7 @@ protected void renderMergedOutputModel(
278273
FlashMapManager flashMapManager = RequestContextUtils.getFlashMapManager(request);
279274
flashMapManager.saveOutputFlashMap(flashMap, request, response);
280275

281-
sendRedirect(request, response, targetUrl.toString(), this.http10Compatible);
276+
sendRedirect(request, response, targetUrl, this.http10Compatible);
282277
}
283278

284279
/**
@@ -362,6 +357,7 @@ private Map<String, String> getCurrentRequestUriVariables(HttpServletRequest req
362357
* @throws UnsupportedEncodingException if string encoding failed
363358
* @see #queryProperties
364359
*/
360+
@SuppressWarnings("unchecked")
365361
protected void appendQueryProperties(StringBuilder targetUrl, Map<String, Object> model, String encodingScheme)
366362
throws UnsupportedEncodingException {
367363

0 commit comments

Comments
 (0)