Skip to content

Commit efce790

Browse files
committed
Polishing
1 parent a4b2ae5 commit efce790

File tree

43 files changed

+107
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+107
-98
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/parsing/ReaderContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void fatal(String message, @Nullable Object source, @Nullable ParseState
9191
}
9292

9393
/**
94-
* Raise a fatal error.
94+
* Raise a regular error.
9595
*/
9696
public void error(String message, @Nullable Object source) {
9797
error(message, source, null, null);

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

spring-context/src/main/java/org/springframework/cache/support/NoOpCache.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public NoOpCache(String name) {
4646
}
4747

4848

49-
5049
@Override
5150
public String getName() {
5251
return this.name;

spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ private static ResolvableType resolveDeclaredEventType(ApplicationListener<Appli
9797
ResolvableType declaredEventType = resolveDeclaredEventType(listener.getClass());
9898
if (declaredEventType == null || declaredEventType.isAssignableFrom(
9999
ResolvableType.forClass(ApplicationEvent.class))) {
100-
101100
Class<?> targetClass = AopUtils.getTargetClass(listener);
102101
if (targetClass != listener.getClass()) {
103102
declaredEventType = resolveDeclaredEventType(targetClass);

spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ public void setMappingLocations(Resource... mappingLocations) {
110110
* Merges the {@code Properties} configured in the {@code mappings} and
111111
* {@code mappingLocations} into the final {@code Properties} instance
112112
* used for {@code ObjectName} resolution.
113-
* @throws IOException
114113
*/
115114
@Override
116115
public void afterPropertiesSet() throws IOException {

spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -142,7 +142,7 @@ public String[] resolveMessageCodes(String errorCode, String objectName) {
142142
* object/field-specific code, a field-specific code, a plain error code.
143143
* <p>Arrays, Lists and Maps are resolved both for specific elements and
144144
* the whole collection.
145-
* <p>See the {@link DefaultMessageCodesResolver class level Javadoc} for
145+
* <p>See the {@link DefaultMessageCodesResolver class level javadoc} for
146146
* details on the generated codes.
147147
* @return the list of codes
148148
*/

spring-core/src/main/java/org/springframework/core/io/VfsUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public abstract class VfsUtils {
9191
Class<?> visitorAttributesClass = loader.loadClass(VFS3_PKG + "VisitorAttributes");
9292
VISITOR_ATTRIBUTES_FIELD_RECURSE = visitorAttributesClass.getField("RECURSE");
9393
}
94-
catch (Exception ex) {
94+
catch (Throwable ex) {
9595
throw new IllegalStateException("Could not detect JBoss VFS infrastructure", ex);
9696
}
9797
}

spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ private Expression[] parseExpressions(String expressionString, ParserContext con
9090
String prefix = context.getExpressionPrefix();
9191
String suffix = context.getExpressionSuffix();
9292
int startIdx = 0;
93+
9394
while (startIdx < expressionString.length()) {
9495
int prefixIndex = expressionString.indexOf(prefix, startIdx);
9596
if (prefixIndex >= startIdx) {
@@ -104,22 +105,18 @@ private Expression[] parseExpressions(String expressionString, ParserContext con
104105
"No ending suffix '" + suffix + "' for expression starting at character " +
105106
prefixIndex + ": " + expressionString.substring(prefixIndex));
106107
}
107-
108108
if (suffixIndex == afterPrefixIndex) {
109109
throw new ParseException(expressionString, prefixIndex,
110110
"No expression defined within delimiter '" + prefix + suffix +
111111
"' at character " + prefixIndex);
112112
}
113-
114113
String expr = expressionString.substring(prefixIndex + prefix.length(), suffixIndex);
115114
expr = expr.trim();
116-
117115
if (expr.isEmpty()) {
118116
throw new ParseException(expressionString, prefixIndex,
119117
"No expression defined within delimiter '" + prefix + suffix +
120118
"' at character " + prefixIndex);
121119
}
122-
123120
expressions.add(doParseExpression(expr, context));
124121
startIdx = suffixIndex + suffix.length();
125122
}
@@ -129,6 +126,7 @@ private Expression[] parseExpressions(String expressionString, ParserContext con
129126
startIdx = expressionString.length();
130127
}
131128
}
129+
132130
return expressions.toArray(new Expression[expressions.size()]);
133131
}
134132

spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class FunctionReference extends SpelNodeImpl {
6262

6363

6464
public FunctionReference(String functionName, int pos, SpelNodeImpl... arguments) {
65-
super(pos,arguments);
65+
super(pos, arguments);
6666
this.name = functionName;
6767
}
6868

spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)