Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
78f739db
Commit
78f739db
authored
Nov 13, 2015
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4463 from izeye/typo-20151113
* pr/4463: Fix typos
parents
b83368a5
0a85281a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15 additions
and
15 deletions
+15
-15
JarFile.java
...ain/java/org/springframework/boot/loader/jar/JarFile.java
+1
-1
SpringApplication.java
...main/java/org/springframework/boot/SpringApplication.java
+2
-2
ServletRegistrationBean.java
...mework/boot/context/embedded/ServletRegistrationBean.java
+1
-1
AtomikosProperties.java
...springframework/boot/jta/atomikos/AtomikosProperties.java
+1
-1
ServletComponentHandler.java
...ngframework/boot/web/servlet/ServletComponentHandler.java
+1
-1
ServletComponentRegisteringPostProcessor.java
...web/servlet/ServletComponentRegisteringPostProcessor.java
+5
-5
BindingPreparationTests.java
...rg/springframework/boot/bind/BindingPreparationTests.java
+1
-1
RelaxedDataBinderTests.java
...org/springframework/boot/bind/RelaxedDataBinderTests.java
+1
-1
WebFilterHandlerTests.java
...ringframework/boot/web/servlet/WebFilterHandlerTests.java
+1
-1
WebServletHandlerTests.java
...ingframework/boot/web/servlet/WebServletHandlerTests.java
+1
-1
No files found.
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
View file @
78f739db
...
...
@@ -456,7 +456,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
}
/**
* Reset any cached handers just in case a jar protocol has already been used. We
* Reset any cached hand
l
ers just in case a jar protocol has already been used. We
* reset the handler by trying to set a null {@link URLStreamHandlerFactory} which
* should have no effect other than clearing the handlers cache.
*/
...
...
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @
78f739db
...
...
@@ -755,7 +755,7 @@ public class SpringApplication {
/**
* Called after the context has been refreshed.
* @param context the application context
* @param args the application argum
m
ents
* @param args the application arguments
*/
protected
void
afterRefresh
(
ConfigurableApplicationContext
context
,
ApplicationArguments
args
)
{
...
...
@@ -799,7 +799,7 @@ public class SpringApplication {
/**
* Called after the context has been refreshed.
* @param context the application context
* @param args the application argum
m
ents
* @param args the application arguments
* @deprecated in 1.3 in favor of
* {@link #afterRefresh(ConfigurableApplicationContext, ApplicationArguments)}
*/
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java
View file @
78f739db
...
...
@@ -100,7 +100,7 @@ public class ServletRegistrationBean extends RegistrationBean {
/**
* Returns the servlet being registered.
* @return the sevlet
* @return the se
r
vlet
*/
protected
Servlet
getServlet
()
{
return
this
.
servlet
;
...
...
spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
View file @
78f739db
...
...
@@ -106,7 +106,7 @@ public class AtomikosProperties {
/**
* Specifies if subtransactions should be joined when possible. Defaults to true. When
* false, no attempt to call {@code XAResource.start(TM_JOIN)} will be made for
* different but related subtransctions. This setting has no effect on resource access
* different but related subtrans
a
ctions. This setting has no effect on resource access
* within one and the same transaction. If you don't use subtransactions then this
* setting can be ignored.
* @param serialJtaTransactions if serial JTA transaction are supported
...
...
spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
View file @
78f739db
...
...
@@ -55,7 +55,7 @@ abstract class ServletComponentHandler {
String
[]
urlPatterns
=
(
String
[])
attributes
.
get
(
"urlPatterns"
);
if
(
urlPatterns
.
length
>
0
)
{
Assert
.
state
(
value
.
length
==
0
,
"The urlPatterns and value attributes
"
+
"are mututally exclusive
"
);
"The urlPatterns and value attributes
are mutually exclusive.
"
);
return
urlPatterns
;
}
return
value
;
...
...
spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
View file @
78f739db
...
...
@@ -46,11 +46,11 @@ class ServletComponentRegisteringPostProcessor
private
static
final
List
<
ServletComponentHandler
>
HANDLERS
;
static
{
List
<
ServletComponentHandler
>
handers
=
new
ArrayList
<
ServletComponentHandler
>();
handers
.
add
(
new
WebServletHandler
());
handers
.
add
(
new
WebFilterHandler
());
handers
.
add
(
new
WebListenerHandler
());
HANDLERS
=
Collections
.
unmodifiableList
(
handers
);
List
<
ServletComponentHandler
>
hand
l
ers
=
new
ArrayList
<
ServletComponentHandler
>();
hand
l
ers
.
add
(
new
WebServletHandler
());
hand
l
ers
.
add
(
new
WebFilterHandler
());
hand
l
ers
.
add
(
new
WebListenerHandler
());
HANDLERS
=
Collections
.
unmodifiableList
(
hand
l
ers
);
}
private
final
Set
<
String
>
packagesToScan
;
...
...
spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
View file @
78f739db
...
...
@@ -189,7 +189,7 @@ public class BindingPreparationTests {
wrapper
.
setPropertyValue
(
"nested[foo]"
,
new
LinkedHashMap
<
String
,
Object
>());
// But it might equally well be a collection, if nested[foo][0]
wrapper
.
setPropertyValue
(
"nested[foo]"
,
new
ArrayList
<
Object
>());
// Then it would have to be actually bound to get the list to autogrow
// Then it would have to be actually bound to get the list to auto
-
grow
wrapper
.
setPropertyValue
(
"nested[foo][0]"
,
"bar"
);
assertNotNull
(
wrapper
.
getPropertyValue
(
"nested[foo][0]"
));
}
...
...
spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
View file @
78f739db
...
...
@@ -243,7 +243,7 @@ public class RelaxedDataBinderTests {
}
@Test
public
void
testBindNestedWithEnviromentStyle
()
throws
Exception
{
public
void
testBindNestedWithEnviro
n
mentStyle
()
throws
Exception
{
TargetWithNestedObject
target
=
new
TargetWithNestedObject
();
bind
(
target
,
"nested_foo: bar\n"
+
"nested_value: 123"
);
assertEquals
(
123
,
target
.
getNested
().
getValue
());
...
...
spring-boot/src/test/java/org/springframework/boot/web/servlet/WebFilterHandlerTests.java
View file @
78f739db
...
...
@@ -155,7 +155,7 @@ public class WebFilterHandlerTests {
public
void
urlPatternsDeclaredTwice
()
throws
IOException
{
this
.
thrown
.
expect
(
IllegalStateException
.
class
);
this
.
thrown
.
expectMessage
(
"The urlPatterns and value attributes are mutu
tally "
+
"exclusive
"
);
"The urlPatterns and value attributes are mutu
ally exclusive.
"
);
getBeanDefinition
(
UrlPatternsDeclaredTwiceFilter
.
class
);
}
...
...
spring-boot/src/test/java/org/springframework/boot/web/servlet/WebServletHandlerTests.java
View file @
78f739db
...
...
@@ -134,7 +134,7 @@ public class WebServletHandlerTests {
public
void
urlPatternsDeclaredTwice
()
throws
IOException
{
this
.
thrown
.
expect
(
IllegalStateException
.
class
);
this
.
thrown
.
expectMessage
(
"The urlPatterns and value attributes are mutu
tally "
+
"exclusive
"
);
"The urlPatterns and value attributes are mutu
ally exclusive.
"
);
getBeanDefinition
(
UrlPatternsDeclaredTwiceServlet
.
class
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment