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
68ffbafb
Commit
68ffbafb
authored
May 26, 2018
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix checkstyle violations
parent
3702da45
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
WebClientExchangeTags.java
...te/metrics/web/reactive/client/WebClientExchangeTags.java
+2
-2
HealthWebEndpointResponseMapperTests.java
.../actuate/health/HealthWebEndpointResponseMapperTests.java
+1
-1
LdapAutoConfigurationTests.java
...k/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java
+1
-1
RepackageMojo.java
...in/java/org/springframework/boot/maven/RepackageMojo.java
+2
-2
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java
View file @
68ffbafb
...
...
@@ -67,7 +67,7 @@ public final class WebClientExchangeTags {
private
static
String
extractPath
(
String
url
)
{
String
path
=
url
.
replaceFirst
(
"^https?://[^/]+/"
,
""
);
return
path
.
startsWith
(
"/"
)
?
path
:
"/"
+
path
;
return
(
path
.
startsWith
(
"/"
)
?
path
:
"/"
+
path
)
;
}
/**
...
...
@@ -87,7 +87,7 @@ public final class WebClientExchangeTags {
* @return the status tag
*/
public
static
Tag
status
(
Throwable
throwable
)
{
return
throwable
instanceof
IOException
?
IO_ERROR
:
CLIENT_ERROR
;
return
(
throwable
instanceof
IOException
?
IO_ERROR
:
CLIENT_ERROR
)
;
}
/**
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java
View file @
68ffbafb
...
...
@@ -113,7 +113,7 @@ public class HealthWebEndpointResponseMapperTests {
SecurityContext
securityContext
=
mock
(
SecurityContext
.
class
);
given
(
securityContext
.
getPrincipal
()).
willReturn
(
mock
(
Principal
.
class
));
given
(
securityContext
.
isUserInRole
(
anyString
()))
.
will
((
Answer
<
Boolean
>)
invocation
->
{
.
will
((
Answer
<
Boolean
>)
(
invocation
)
->
{
String
expectedRole
=
invocation
.
getArgument
(
0
);
return
associatedRoles
.
contains
(
expectedRole
);
});
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java
View file @
68ffbafb
...
...
@@ -108,7 +108,7 @@ public class LdapAutoConfigurationTests {
@Test
public
void
templateExists
()
{
this
.
contextRunner
.
withPropertyValues
(
"spring.ldap.urls:ldap://localhost:389"
)
.
run
(
context
->
assertThat
(
context
).
hasSingleBean
(
LdapTemplate
.
class
));
.
run
(
(
context
)
->
assertThat
(
context
).
hasSingleBean
(
LdapTemplate
.
class
));
}
@Test
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
View file @
68ffbafb
...
...
@@ -345,8 +345,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
this
.
classifier
,
target
);
}
else
{
String
artifactId
=
this
.
classifier
!=
null
?
"artifact with classifier "
+
this
.
classifier
:
"main artifact"
;
String
artifactId
=
(
this
.
classifier
!=
null
?
"artifact with classifier "
+
this
.
classifier
:
"main artifact"
)
;
getLog
().
info
(
String
.
format
(
"Replacing %s %s"
,
artifactId
,
source
.
getFile
()));
source
.
setFile
(
target
);
}
...
...
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