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
e6d5f5a2
Commit
e6d5f5a2
authored
Jan 31, 2020
by
Johnny Lim
Committed by
Stephane Nicoll
Feb 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
See gh-19995
parent
afb67887
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
29 deletions
+13
-29
WebMvcTags.java
...ramework/boot/actuate/metrics/web/servlet/WebMvcTags.java
+1
-1
ProjectGenerationRequest.java
...ework/boot/cli/command/init/ProjectGenerationRequest.java
+1
-1
BootJar.java
...g/springframework/boot/gradle/tasks/bundling/BootJar.java
+6
-17
AbstractBootArchiveTests.java
.../boot/gradle/tasks/bundling/AbstractBootArchiveTests.java
+0
-5
AbstractRunMojo.java
.../java/org/springframework/boot/maven/AbstractRunMojo.java
+1
-1
WebServiceTemplateBuilder.java
...rk/boot/webservices/client/WebServiceTemplateBuilder.java
+3
-3
JavaxApiValidationExceptionFailureAnalyzerTests.java
...yzer/JavaxApiValidationExceptionFailureAnalyzerTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java
View file @
e6d5f5a2
...
...
@@ -161,7 +161,7 @@ public final class WebMvcTags {
}
/**
* Creates a {@code exception} tag based on the {@link Class#getSimpleName() simple
* Creates a
n
{@code exception} tag based on the {@link Class#getSimpleName() simple
* name} of the class of the given {@code exception}.
* @param exception the exception, may be {@code null}
* @return the exception tag derived from the exception
...
...
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
View file @
e6d5f5a2
...
...
@@ -71,7 +71,7 @@ class ProjectGenerationRequest {
private
String
bootVersion
;
private
List
<
String
>
dependencies
=
new
ArrayList
<>();
private
final
List
<
String
>
dependencies
=
new
ArrayList
<>();
/**
* The URL of the service to use.
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
View file @
e6d5f5a2
...
...
@@ -69,7 +69,7 @@ public class BootJar extends Jar implements BootArchive {
private
static
final
String
BOOT_INF_LAYERS
=
"BOOT-INF/layers"
;
private
List
<
String
>
dependencies
=
new
ArrayList
<>();
private
final
List
<
String
>
dependencies
=
new
ArrayList
<>();
/**
* Creates a new {@code BootJar} task.
...
...
@@ -111,22 +111,11 @@ public class BootJar extends Jar implements BootArchive {
}
private
File
createClasspathIndex
(
List
<
String
>
dependencies
)
{
try
{
StringWriter
content
=
new
StringWriter
();
BufferedWriter
writer
=
new
BufferedWriter
(
content
);
for
(
String
dependency
:
dependencies
)
{
writer
.
write
(
dependency
);
writer
.
write
(
"\n"
);
}
writer
.
flush
();
File
source
=
getProject
().
getResources
().
getText
().
fromString
(
content
.
toString
()).
asFile
();
File
indexFile
=
new
File
(
source
.
getParentFile
(),
"classpath.idx"
);
source
.
renameTo
(
indexFile
);
return
indexFile
;
}
catch
(
IOException
ex
)
{
throw
new
RuntimeException
(
"Failed to create classpath.idx"
,
ex
);
}
String
content
=
dependencies
.
stream
().
collect
(
Collectors
.
joining
(
"\n"
,
""
,
"\n"
));
File
source
=
getProject
().
getResources
().
getText
().
fromString
(
content
).
asFile
();
File
indexFile
=
new
File
(
source
.
getParentFile
(),
"classpath.idx"
);
source
.
renameTo
(
indexFile
);
return
indexFile
;
}
@Override
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java
View file @
e6d5f5a2
...
...
@@ -411,11 +411,6 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
this
.
libPath
+
"third-library.jar"
);
}
@Test
void
libEntriesAreStored
()
throws
IOException
{
}
protected
File
jarFile
(
String
name
)
throws
IOException
{
File
file
=
newFile
(
name
);
try
(
JarOutputStream
jar
=
new
JarOutputStream
(
new
FileOutputStream
(
file
)))
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View file @
e6d5f5a2
...
...
@@ -326,7 +326,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
/**
* Provides access to the java binary executable, regardless of OS.
* @return the java executable
*
*
/
*/
protected
String
getJavaExecutable
()
{
Toolchain
toolchain
=
this
.
toolchainManager
.
getToolchainFromBuildContext
(
"jdk"
,
this
.
session
);
String
javaExecutable
=
(
toolchain
!=
null
)
?
toolchain
.
findTool
(
"java"
)
:
null
;
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
View file @
e6d5f5a2
...
...
@@ -329,7 +329,7 @@ public class WebServiceTemplateBuilder {
* @param messageFactory the message factory to use for creating messages
* @return a new builder instance.
* @see WebServiceTemplate#setMessageFactory(WebServiceMessageFactory)
*
*
/
*/
public
WebServiceTemplateBuilder
setWebServiceMessageFactory
(
WebServiceMessageFactory
messageFactory
)
{
Assert
.
notNull
(
messageFactory
,
"MessageFactory must not be null"
);
return
new
WebServiceTemplateBuilder
(
this
.
detectHttpMessageSender
,
this
.
interceptors
,
this
.
internalCustomizers
,
...
...
@@ -342,7 +342,7 @@ public class WebServiceTemplateBuilder {
* @param unmarshaller the message unmarshaller
* @return a new builder instance.
* @see WebServiceTemplate#setUnmarshaller(Unmarshaller)
*
*
/
*/
public
WebServiceTemplateBuilder
setUnmarshaller
(
Unmarshaller
unmarshaller
)
{
return
new
WebServiceTemplateBuilder
(
this
.
detectHttpMessageSender
,
this
.
interceptors
,
this
.
internalCustomizers
,
this
.
customizers
,
this
.
messageSenders
,
this
.
marshaller
,
unmarshaller
,
this
.
destinationProvider
,
...
...
@@ -354,7 +354,7 @@ public class WebServiceTemplateBuilder {
* @param marshaller the message marshaller
* @return a new builder instance.
* @see WebServiceTemplate#setMarshaller(Marshaller)
*
*
/
*/
public
WebServiceTemplateBuilder
setMarshaller
(
Marshaller
marshaller
)
{
return
new
WebServiceTemplateBuilder
(
this
.
detectHttpMessageSender
,
this
.
interceptors
,
this
.
internalCustomizers
,
this
.
customizers
,
this
.
messageSenders
,
marshaller
,
this
.
unmarshaller
,
this
.
destinationProvider
,
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/JavaxApiValidationExceptionFailureAnalyzerTests
2
.java
→
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/JavaxApiValidationExceptionFailureAnalyzerTests.java
View file @
e6d5f5a2
...
...
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
*/
@ClassPathExclusions
(
"hibernate-validator-*.jar"
)
@ClassPathOverrides
(
"javax.validation:validation-api:2.0.1.Final"
)
class
JavaxApiValidationExceptionFailureAnalyzerTests
2
{
class
JavaxApiValidationExceptionFailureAnalyzerTests
{
@Test
void
validatedPropertiesTest
()
{
...
...
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