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
5f673c9e
Commit
5f673c9e
authored
Nov 21, 2014
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix usage of putIfAbsent
parent
0f64a047
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
SimpleConfigurationMetadataRepository.java
...rationmetadata/SimpleConfigurationMetadataRepository.java
+11
-5
No files found.
spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/configurationmetadata/SimpleConfigurationMetadataRepository.java
View file @
5f673c9e
...
...
@@ -58,7 +58,7 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad
}
String
sourceType
=
source
.
getType
();
if
(
sourceType
!=
null
)
{
group
.
getSources
().
putIfAbsent
(
sourceType
,
source
);
putIfAbsent
(
group
.
getSources
(),
sourceType
,
source
);
}
}
}
...
...
@@ -69,9 +69,9 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad
*/
public
void
add
(
ConfigurationMetadataProperty
property
,
ConfigurationMetadataSource
source
)
{
if
(
source
!=
null
)
{
source
.
getProperties
().
putIfAbsent
(
property
.
getId
(),
property
);
putIfAbsent
(
source
.
getProperties
(),
property
.
getId
(),
property
);
}
getGroup
(
source
).
getProperties
().
putIfAbsent
(
property
.
getId
(),
property
);
putIfAbsent
(
getGroup
(
source
).
getProperties
(),
property
.
getId
(),
property
);
}
...
...
@@ -87,11 +87,11 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad
else
{
// Merge properties
for
(
Map
.
Entry
<
String
,
ConfigurationMetadataProperty
>
entry
:
group
.
getProperties
().
entrySet
())
{
existingGroup
.
getProperties
().
putIfAbsent
(
entry
.
getKey
(),
entry
.
getValue
());
putIfAbsent
(
existingGroup
.
getProperties
(),
entry
.
getKey
(),
entry
.
getValue
());
}
// Merge sources
for
(
Map
.
Entry
<
String
,
ConfigurationMetadataSource
>
entry
:
group
.
getSources
().
entrySet
())
{
existingGroup
.
getSources
().
putIfAbsent
(
entry
.
getKey
(),
entry
.
getValue
());
putIfAbsent
(
existingGroup
.
getSources
(),
entry
.
getKey
(),
entry
.
getValue
());
}
}
}
...
...
@@ -112,4 +112,10 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad
}
}
private
<
V
>
void
putIfAbsent
(
Map
<
String
,
V
>
map
,
String
key
,
V
value
)
{
if
(!
map
.
containsKey
(
key
))
{
map
.
put
(
key
,
value
);
}
}
}
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