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
5742c238
Commit
5742c238
authored
Oct 22, 2018
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14916 from dreis2211
* gh-14916: Avoid creation of unnecessary collections
parents
35221c11
5c0d7f4a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
12 deletions
+5
-12
ControllerEndpointHandlerMapping.java
...dpoint/web/reactive/ControllerEndpointHandlerMapping.java
+1
-3
ControllerEndpointHandlerMapping.java
...ndpoint/web/servlet/ControllerEndpointHandlerMapping.java
+1
-2
ConfigurationMetadataAnnotationProcessor.java
...onprocessor/ConfigurationMetadataAnnotationProcessor.java
+2
-4
DefaultLaunchScript.java
...pringframework/boot/loader/tools/DefaultLaunchScript.java
+1
-3
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java
View file @
5742c238
...
...
@@ -17,10 +17,8 @@
package
org
.
springframework
.
boot
.
actuate
.
endpoint
.
web
.
reactive
;
import
java.lang.reflect.Method
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.LinkedHashMap
;
import
java.util.Map
;
import
java.util.Set
;
...
...
@@ -95,7 +93,7 @@ public class ControllerEndpointHandlerMapping extends RequestMappingHandlerMappi
ExposableControllerEndpoint
endpoint
,
RequestMappingInfo
mapping
)
{
Set
<
PathPattern
>
patterns
=
mapping
.
getPatternsCondition
().
getPatterns
();
if
(
patterns
.
isEmpty
())
{
patterns
=
new
HashSet
<>(
Arrays
.
asList
(
getPathPatternParser
().
parse
(
""
)
));
patterns
=
Collections
.
singleton
(
getPathPatternParser
().
parse
(
""
));
}
PathPattern
[]
endpointMappedPatterns
=
patterns
.
stream
()
.
map
((
pattern
)
->
getEndpointMappedPattern
(
endpoint
,
pattern
))
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMapping.java
View file @
5742c238
...
...
@@ -19,7 +19,6 @@ package org.springframework.boot.actuate.endpoint.web.servlet;
import
java.lang.reflect.Method
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -95,7 +94,7 @@ public class ControllerEndpointHandlerMapping extends RequestMappingHandlerMappi
ExposableControllerEndpoint
endpoint
,
RequestMappingInfo
mapping
)
{
Set
<
String
>
patterns
=
mapping
.
getPatternsCondition
().
getPatterns
();
if
(
patterns
.
isEmpty
())
{
patterns
=
new
HashSet
<>(
Collections
.
singletonList
(
""
)
);
patterns
=
Collections
.
singleton
(
""
);
}
String
[]
endpointMappedPatterns
=
patterns
.
stream
()
.
map
((
pattern
)
->
getEndpointMappedPattern
(
endpoint
,
pattern
))
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View file @
5742c238
...
...
@@ -20,9 +20,7 @@ import java.io.FileNotFoundException;
import
java.io.PrintWriter
;
import
java.io.StringWriter
;
import
java.time.Duration
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -97,8 +95,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
static
final
String
LOMBOK_ACCESS_LEVEL_PUBLIC
=
"PUBLIC"
;
private
static
final
Set
<
String
>
SUPPORTED_OPTIONS
=
Collections
.
unmodifiableSet
(
new
HashSet
<>(
Arrays
.
asList
(
ADDITIONAL_METADATA_LOCATIONS_OPTION
)
));
private
static
final
Set
<
String
>
SUPPORTED_OPTIONS
=
Collections
.
unmodifiableSet
(
Collections
.
singleton
(
ADDITIONAL_METADATA_LOCATIONS_OPTION
));
private
MetadataStore
metadataStore
;
...
...
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java
View file @
5742c238
...
...
@@ -23,9 +23,7 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.regex.Matcher
;
...
...
@@ -48,7 +46,7 @@ public class DefaultLaunchScript implements LaunchScript {
.
compile
(
"\\{\\{(\\w+)(:.*?)?\\}\\}(?!\\})"
);
private
static
final
Set
<
String
>
FILE_PATH_KEYS
=
Collections
.
unmodifiableSet
(
new
HashSet
<>(
Arrays
.
asList
(
"inlinedConfScript"
)
));
.
unmodifiableSet
(
Collections
.
singleton
(
"inlinedConfScript"
));
private
final
String
content
;
...
...
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