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
eaa3bd04
Commit
eaa3bd04
authored
Sep 04, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply eclipse formatting rules
parent
990213b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
MongoHealthIndicatorTests.java
...mework/boot/actuate/health/MongoHealthIndicatorTests.java
+1
-1
ProjectLibraries.java
...ringframework/boot/gradle/repackage/ProjectLibraries.java
+7
-5
RelaxedPropertyResolverTests.java
...ringframework/boot/bind/RelaxedPropertyResolverTests.java
+5
-5
No files found.
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java
View file @
eaa3bd04
...
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue;
...
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue;
/**
/**
* Tests for {@link MongoHealthIndicator}.
* Tests for {@link MongoHealthIndicator}.
*
*
* @author Christian Dupuis
* @author Christian Dupuis
*/
*/
public
class
MongoHealthIndicatorTests
{
public
class
MongoHealthIndicatorTests
{
...
...
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java
View file @
eaa3bd04
...
@@ -115,14 +115,15 @@ class ProjectLibraries implements Libraries {
...
@@ -115,14 +115,15 @@ class ProjectLibraries implements Libraries {
return
libraries
;
return
libraries
;
}
}
private
Set
<
GradleLibrary
>
getLibrariesForFileDependencies
(
Configuration
configuration
,
private
Set
<
GradleLibrary
>
getLibrariesForFileDependencies
(
LibraryScope
scope
)
{
Configuration
configuration
,
LibraryScope
scope
)
{
Set
<
GradleLibrary
>
libraries
=
new
LinkedHashSet
<
GradleLibrary
>();
Set
<
GradleLibrary
>
libraries
=
new
LinkedHashSet
<
GradleLibrary
>();
for
(
Dependency
dependency
:
configuration
.
getIncoming
().
getDependencies
())
{
for
(
Dependency
dependency
:
configuration
.
getIncoming
().
getDependencies
())
{
if
(
dependency
instanceof
FileCollectionDependency
)
{
if
(
dependency
instanceof
FileCollectionDependency
)
{
FileCollectionDependency
fileDependency
=
(
FileCollectionDependency
)
dependency
;
FileCollectionDependency
fileDependency
=
(
FileCollectionDependency
)
dependency
;
for
(
File
file
:
fileDependency
.
resolve
())
{
for
(
File
file
:
fileDependency
.
resolve
())
{
libraries
.
add
(
new
GradleLibrary
(
fileDependency
.
getGroup
(),
file
,
scope
));
libraries
.
add
(
new
GradleLibrary
(
fileDependency
.
getGroup
(),
file
,
scope
));
}
}
}
}
else
if
(
dependency
instanceof
ProjectDependency
)
{
else
if
(
dependency
instanceof
ProjectDependency
)
{
...
@@ -134,7 +135,8 @@ class ProjectLibraries implements Libraries {
...
@@ -134,7 +135,8 @@ class ProjectLibraries implements Libraries {
return
libraries
;
return
libraries
;
}
}
private
Set
<
GradleLibrary
>
minus
(
Set
<
GradleLibrary
>
source
,
Set
<
GradleLibrary
>
toRemove
)
{
private
Set
<
GradleLibrary
>
minus
(
Set
<
GradleLibrary
>
source
,
Set
<
GradleLibrary
>
toRemove
)
{
if
(
source
==
null
||
toRemove
==
null
)
{
if
(
source
==
null
||
toRemove
==
null
)
{
return
source
;
return
source
;
}
}
...
@@ -191,7 +193,7 @@ class ProjectLibraries implements Libraries {
...
@@ -191,7 +193,7 @@ class ProjectLibraries implements Libraries {
@Override
@Override
public
String
getName
()
{
public
String
getName
()
{
String
name
=
super
.
getName
();
String
name
=
super
.
getName
();
if
(
this
.
includeGroupName
&&
this
.
group
!=
null
)
{
if
(
this
.
includeGroupName
&&
this
.
group
!=
null
)
{
name
=
this
.
group
+
"-"
+
name
;
name
=
this
.
group
+
"-"
+
name
;
}
}
return
name
;
return
name
;
...
...
spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
View file @
eaa3bd04
...
@@ -16,11 +16,6 @@
...
@@ -16,11 +16,6 @@
package
org
.
springframework
.
boot
.
bind
;
package
org
.
springframework
.
boot
.
bind
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Properties
;
import
java.util.Properties
;
...
@@ -34,6 +29,11 @@ import org.springframework.core.env.MutablePropertySources;
...
@@ -34,6 +29,11 @@ import org.springframework.core.env.MutablePropertySources;
import
org.springframework.core.env.PropertiesPropertySource
;
import
org.springframework.core.env.PropertiesPropertySource
;
import
org.springframework.core.env.StandardEnvironment
;
import
org.springframework.core.env.StandardEnvironment
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertThat
;
/**
/**
* Tests for {@link RelaxedPropertyResolver}.
* Tests for {@link RelaxedPropertyResolver}.
*
*
...
...
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