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
b605cddb
Commit
b605cddb
authored
Aug 09, 2019
by
dreis2211
Committed by
Stephane Nicoll
Aug 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish some Collections API calls
See gh-17825
parent
6921e240
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
JndiPropertiesHidingClassLoader.java
...t/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
+1
-1
ExplodedArchive.java
.../springframework/boot/loader/archive/ExplodedArchive.java
+1
-1
SpringBootServletInitializerTests.java
...eb/servlet/support/SpringBootServletInitializerTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
View file @
b605cddb
...
...
@@ -36,7 +36,7 @@ public class JndiPropertiesHidingClassLoader extends ClassLoader {
@Override
public
Enumeration
<
URL
>
getResources
(
String
name
)
throws
IOException
{
if
(
"jndi.properties"
.
equals
(
name
))
{
return
Collections
.
e
numeration
(
Collections
.
emptyList
()
);
return
Collections
.
e
mptyEnumeration
(
);
}
return
super
.
getResources
(
name
);
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
View file @
b605cddb
...
...
@@ -173,7 +173,7 @@ public class ExplodedArchive implements Archive {
private
Iterator
<
File
>
listFiles
(
File
file
)
{
File
[]
files
=
file
.
listFiles
();
if
(
files
==
null
)
{
return
Collections
.
<
File
>
emptyList
().
i
terator
();
return
Collections
.
emptyI
terator
();
}
Arrays
.
sort
(
files
,
this
.
entryComparator
);
return
Arrays
.
asList
(
files
).
iterator
();
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
View file @
b605cddb
...
...
@@ -129,7 +129,7 @@ class SpringBootServletInitializerTests {
given
(
servletContext
.
getInitParameterNames
())
.
willReturn
(
Collections
.
enumeration
(
Collections
.
singletonList
(
"spring.profiles.active"
)));
given
(
servletContext
.
getInitParameter
(
"spring.profiles.active"
)).
willReturn
(
"from-servlet-context"
);
given
(
servletContext
.
getAttributeNames
()).
willReturn
(
Collections
.
e
numeration
(
Collections
.
emptyList
()
));
given
(
servletContext
.
getAttributeNames
()).
willReturn
(
Collections
.
e
mptyEnumeration
(
));
try
(
ConfigurableApplicationContext
context
=
(
ConfigurableApplicationContext
)
new
PropertySourceVerifyingSpringBootServletInitializer
()
.
createRootApplicationContext
(
servletContext
))
{
assertThat
(
context
.
getEnvironment
().
getActiveProfiles
()).
containsExactly
(
"from-servlet-context"
);
...
...
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