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
f65dfe4b
Commit
f65dfe4b
authored
Jun 19, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix javadoc errors and warnings
parent
890554e8
Changes
26
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
315 additions
and
75 deletions
+315
-75
pom.xml
spring-boot-docs/pom.xml
+238
-10
FileUtils.java
...java/org/springframework/boot/loader/tools/FileUtils.java
+1
-1
JarWriter.java
...java/org/springframework/boot/loader/tools/JarWriter.java
+8
-8
Libraries.java
...java/org/springframework/boot/loader/tools/Libraries.java
+1
-1
LibraryCallback.java
...rg/springframework/boot/loader/tools/LibraryCallback.java
+1
-1
MainClassFinder.java
...rg/springframework/boot/loader/tools/MainClassFinder.java
+4
-4
Repackager.java
...ava/org/springframework/boot/loader/tools/Repackager.java
+3
-3
ExecutableArchiveLauncher.java
...pringframework/boot/loader/ExecutableArchiveLauncher.java
+1
-1
Launcher.java
...c/main/java/org/springframework/boot/loader/Launcher.java
+6
-6
Archive.java
...java/org/springframework/boot/loader/archive/Archive.java
+5
-5
RandomAccessData.java
...rg/springframework/boot/loader/data/RandomAccessData.java
+1
-1
JarEntryData.java
...ava/org/springframework/boot/loader/jar/JarEntryData.java
+1
-1
JarFile.java
...ain/java/org/springframework/boot/loader/jar/JarFile.java
+10
-10
AsciiBytes.java
...java/org/springframework/boot/loader/util/AsciiBytes.java
+3
-3
SpringApplication.java
...main/java/org/springframework/boot/SpringApplication.java
+0
-1
SpringApplicationBuilder.java
...pringframework/boot/builder/SpringApplicationBuilder.java
+1
-1
ContextIdApplicationContextInitializer.java
.../boot/context/ContextIdApplicationContextInitializer.java
+2
-2
ConfigurationPropertiesBindingPostProcessor.java
...operties/ConfigurationPropertiesBindingPostProcessor.java
+8
-7
EnableConfigurationProperties.java
...oot/context/properties/EnableConfigurationProperties.java
+1
-0
PropertySourceLoader.java
...va/org/springframework/boot/env/PropertySourceLoader.java
+1
-1
PropertySourcesLoader.java
...a/org/springframework/boot/env/PropertySourcesLoader.java
+4
-4
AtomikosProperties.java
...springframework/boot/jta/atomikos/AtomikosProperties.java
+1
-1
EntityScan.java
...ain/java/org/springframework/boot/orm/jpa/EntityScan.java
+5
-3
IntegrationTest.java
...n/java/org/springframework/boot/test/IntegrationTest.java
+1
-0
SpringApplicationConfiguration.java
...ngframework/boot/test/SpringApplicationConfiguration.java
+6
-0
WebIntegrationTest.java
...ava/org/springframework/boot/test/WebIntegrationTest.java
+2
-0
No files found.
spring-boot-docs/pom.xml
View file @
f65dfe4b
This diff is collapsed.
Click to expand it.
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java
View file @
f65dfe4b
...
@@ -60,7 +60,7 @@ public abstract class FileUtils {
...
@@ -60,7 +60,7 @@ public abstract class FileUtils {
* Generate a SHA.1 Hash for a given file.
* Generate a SHA.1 Hash for a given file.
* @param file the file to hash
* @param file the file to hash
* @return the hash value as a String
* @return the hash value as a String
* @throws IOException
* @throws IOException
if the file cannot be read
*/
*/
public
static
String
sha1Hash
(
File
file
)
throws
IOException
{
public
static
String
sha1Hash
(
File
file
)
throws
IOException
{
try
{
try
{
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
View file @
f65dfe4b
...
@@ -62,8 +62,8 @@ public class JarWriter {
...
@@ -62,8 +62,8 @@ public class JarWriter {
/**
/**
* Create a new {@link JarWriter} instance.
* Create a new {@link JarWriter} instance.
* @param file the file to write
* @param file the file to write
* @throws IOException
* @throws IOException
if the file cannot be opened
* @throws FileNotFoundException
* @throws FileNotFoundException
if the file cannot be found
*/
*/
public
JarWriter
(
File
file
)
throws
FileNotFoundException
,
IOException
{
public
JarWriter
(
File
file
)
throws
FileNotFoundException
,
IOException
{
this
(
file
,
null
);
this
(
file
,
null
);
...
@@ -73,8 +73,8 @@ public class JarWriter {
...
@@ -73,8 +73,8 @@ public class JarWriter {
* Create a new {@link JarWriter} instance.
* Create a new {@link JarWriter} instance.
* @param file the file to write
* @param file the file to write
* @param launchScript an optional launch script to prepend to the front of the jar
* @param launchScript an optional launch script to prepend to the front of the jar
* @throws IOException
* @throws IOException
if the file cannot be opened
* @throws FileNotFoundException
* @throws FileNotFoundException
if the file cannot be found
*/
*/
public
JarWriter
(
File
file
,
LaunchScript
launchScript
)
throws
FileNotFoundException
,
public
JarWriter
(
File
file
,
LaunchScript
launchScript
)
throws
FileNotFoundException
,
IOException
{
IOException
{
...
@@ -102,7 +102,7 @@ public class JarWriter {
...
@@ -102,7 +102,7 @@ public class JarWriter {
/**
/**
* Write the specified manifest.
* Write the specified manifest.
* @param manifest the manifest to write
* @param manifest the manifest to write
* @throws IOException
* @throws IOException
of the manifest cannot be written
*/
*/
public
void
writeManifest
(
final
Manifest
manifest
)
throws
IOException
{
public
void
writeManifest
(
final
Manifest
manifest
)
throws
IOException
{
JarEntry
entry
=
new
JarEntry
(
"META-INF/MANIFEST.MF"
);
JarEntry
entry
=
new
JarEntry
(
"META-INF/MANIFEST.MF"
);
...
@@ -117,7 +117,7 @@ public class JarWriter {
...
@@ -117,7 +117,7 @@ public class JarWriter {
/**
/**
* Write all entries from the specified jar file.
* Write all entries from the specified jar file.
* @param jarFile the source jar file
* @param jarFile the source jar file
* @throws IOException
* @throws IOException
if the entries cannot be written
*/
*/
public
void
writeEntries
(
JarFile
jarFile
)
throws
IOException
{
public
void
writeEntries
(
JarFile
jarFile
)
throws
IOException
{
Enumeration
<
JarEntry
>
entries
=
jarFile
.
entries
();
Enumeration
<
JarEntry
>
entries
=
jarFile
.
entries
();
...
@@ -194,7 +194,7 @@ public class JarWriter {
...
@@ -194,7 +194,7 @@ public class JarWriter {
/**
/**
* Write the required spring-boot-loader classes to the JAR.
* Write the required spring-boot-loader classes to the JAR.
* @throws IOException
* @throws IOException
if the classes cannot be written
*/
*/
public
void
writeLoaderClasses
()
throws
IOException
{
public
void
writeLoaderClasses
()
throws
IOException
{
URL
loaderJar
=
getClass
().
getClassLoader
().
getResource
(
NESTED_LOADER_JAR
);
URL
loaderJar
=
getClass
().
getClassLoader
().
getResource
(
NESTED_LOADER_JAR
);
...
@@ -211,7 +211,7 @@ public class JarWriter {
...
@@ -211,7 +211,7 @@ public class JarWriter {
/**
/**
* Close the writer.
* Close the writer.
* @throws IOException
* @throws IOException
if the file cannot be closed
*/
*/
public
void
close
()
throws
IOException
{
public
void
close
()
throws
IOException
{
this
.
jarOutput
.
close
();
this
.
jarOutput
.
close
();
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java
View file @
f65dfe4b
...
@@ -37,7 +37,7 @@ public interface Libraries {
...
@@ -37,7 +37,7 @@ public interface Libraries {
/**
/**
* Iterate all relevant libraries.
* Iterate all relevant libraries.
* @param callback a callback for each relevant library.
* @param callback a callback for each relevant library.
* @throws IOException
* @throws IOException
if the operation fails
*/
*/
void
doWithLibraries
(
LibraryCallback
callback
)
throws
IOException
;
void
doWithLibraries
(
LibraryCallback
callback
)
throws
IOException
;
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java
View file @
f65dfe4b
...
@@ -29,7 +29,7 @@ public interface LibraryCallback {
...
@@ -29,7 +29,7 @@ public interface LibraryCallback {
/**
/**
* Callback to for a single library backed by a {@link File}.
* Callback to for a single library backed by a {@link File}.
* @param library the library
* @param library the library
* @throws IOException
* @throws IOException
if the operation fails
*/
*/
void
library
(
Library
library
)
throws
IOException
;
void
library
(
Library
library
)
throws
IOException
;
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
View file @
f65dfe4b
...
@@ -76,7 +76,7 @@ public abstract class MainClassFinder {
...
@@ -76,7 +76,7 @@ public abstract class MainClassFinder {
* Find the main class from a given folder.
* Find the main class from a given folder.
* @param rootFolder the root folder to search
* @param rootFolder the root folder to search
* @return the main class or {@code null}
* @return the main class or {@code null}
* @throws IOException
* @throws IOException
if the folder cannot be read
*/
*/
public
static
String
findMainClass
(
File
rootFolder
)
throws
IOException
{
public
static
String
findMainClass
(
File
rootFolder
)
throws
IOException
{
return
doWithMainClasses
(
rootFolder
,
new
ClassNameCallback
<
String
>()
{
return
doWithMainClasses
(
rootFolder
,
new
ClassNameCallback
<
String
>()
{
...
@@ -91,7 +91,7 @@ public abstract class MainClassFinder {
...
@@ -91,7 +91,7 @@ public abstract class MainClassFinder {
* Find a single main class from a given folder.
* Find a single main class from a given folder.
* @param rootFolder the root folder to search
* @param rootFolder the root folder to search
* @return the main class or {@code null}
* @return the main class or {@code null}
* @throws IOException
* @throws IOException
if the folder cannot be read
*/
*/
public
static
String
findSingleMainClass
(
File
rootFolder
)
throws
IOException
{
public
static
String
findSingleMainClass
(
File
rootFolder
)
throws
IOException
{
MainClassesCallback
callback
=
new
MainClassesCallback
();
MainClassesCallback
callback
=
new
MainClassesCallback
();
...
@@ -161,7 +161,7 @@ public abstract class MainClassFinder {
...
@@ -161,7 +161,7 @@ public abstract class MainClassFinder {
* @param jarFile the jar file to search
* @param jarFile the jar file to search
* @param classesLocation the location within the jar containing classes
* @param classesLocation the location within the jar containing classes
* @return the main class or {@code null}
* @return the main class or {@code null}
* @throws IOException
* @throws IOException
if the jar file cannot be read
*/
*/
public
static
String
findMainClass
(
JarFile
jarFile
,
String
classesLocation
)
public
static
String
findMainClass
(
JarFile
jarFile
,
String
classesLocation
)
throws
IOException
{
throws
IOException
{
...
@@ -179,7 +179,7 @@ public abstract class MainClassFinder {
...
@@ -179,7 +179,7 @@ public abstract class MainClassFinder {
* @param jarFile the jar file to search
* @param jarFile the jar file to search
* @param classesLocation the location within the jar containing classes
* @param classesLocation the location within the jar containing classes
* @return the main class or {@code null}
* @return the main class or {@code null}
* @throws IOException
* @throws IOException
if the jar file cannot be read
*/
*/
public
static
String
findSingleMainClass
(
JarFile
jarFile
,
String
classesLocation
)
public
static
String
findSingleMainClass
(
JarFile
jarFile
,
String
classesLocation
)
throws
IOException
{
throws
IOException
{
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
View file @
f65dfe4b
...
@@ -90,7 +90,7 @@ public class Repackager {
...
@@ -90,7 +90,7 @@ public class Repackager {
/**
/**
* Repackage the source file so that it can be run using '{@literal java -jar}'
* Repackage the source file so that it can be run using '{@literal java -jar}'
* @param libraries the libraries required to run the archive
* @param libraries the libraries required to run the archive
* @throws IOException
* @throws IOException
if the file cannot be repackaged
*/
*/
public
void
repackage
(
Libraries
libraries
)
throws
IOException
{
public
void
repackage
(
Libraries
libraries
)
throws
IOException
{
repackage
(
this
.
source
,
libraries
);
repackage
(
this
.
source
,
libraries
);
...
@@ -101,7 +101,7 @@ public class Repackager {
...
@@ -101,7 +101,7 @@ public class Repackager {
* {@literal java -jar}'
* {@literal java -jar}'
* @param destination the destination file (may be the same as the source)
* @param destination the destination file (may be the same as the source)
* @param libraries the libraries required to run the archive
* @param libraries the libraries required to run the archive
* @throws IOException
* @throws IOException
if the file cannot be repackaged
*/
*/
public
void
repackage
(
File
destination
,
Libraries
libraries
)
throws
IOException
{
public
void
repackage
(
File
destination
,
Libraries
libraries
)
throws
IOException
{
repackage
(
destination
,
libraries
,
null
);
repackage
(
destination
,
libraries
,
null
);
...
@@ -113,7 +113,7 @@ public class Repackager {
...
@@ -113,7 +113,7 @@ public class Repackager {
* @param destination the destination file (may be the same as the source)
* @param destination the destination file (may be the same as the source)
* @param libraries the libraries required to run the archive
* @param libraries the libraries required to run the archive
* @param launchScript an optional launch script prepended to the front of the jar
* @param launchScript an optional launch script prepended to the front of the jar
* @throws IOException
* @throws IOException
if the file cannot be repackaged
* @since 1.3.0
* @since 1.3.0
*/
*/
public
void
repackage
(
File
destination
,
Libraries
libraries
,
LaunchScript
launchScript
)
public
void
repackage
(
File
destination
,
Libraries
libraries
,
LaunchScript
launchScript
)
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java
View file @
f65dfe4b
...
@@ -119,7 +119,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher {
...
@@ -119,7 +119,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher {
* Called to post-process archive entries before they are used. Implementations can
* Called to post-process archive entries before they are used. Implementations can
* add and remove entries.
* add and remove entries.
* @param archives the archives
* @param archives the archives
* @throws Exception
* @throws Exception
if the post processing fails
*/
*/
protected
void
postProcessClassPathArchives
(
List
<
Archive
>
archives
)
throws
Exception
{
protected
void
postProcessClassPathArchives
(
List
<
Archive
>
archives
)
throws
Exception
{
}
}
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
View file @
f65dfe4b
...
@@ -70,7 +70,7 @@ public abstract class Launcher {
...
@@ -70,7 +70,7 @@ public abstract class Launcher {
* Create a classloader for the specified archives.
* Create a classloader for the specified archives.
* @param archives the archives
* @param archives the archives
* @return the classloader
* @return the classloader
* @throws Exception
* @throws Exception
if the classloader cannot be created
*/
*/
protected
ClassLoader
createClassLoader
(
List
<
Archive
>
archives
)
throws
Exception
{
protected
ClassLoader
createClassLoader
(
List
<
Archive
>
archives
)
throws
Exception
{
List
<
URL
>
urls
=
new
ArrayList
<
URL
>(
archives
.
size
());
List
<
URL
>
urls
=
new
ArrayList
<
URL
>(
archives
.
size
());
...
@@ -86,7 +86,7 @@ public abstract class Launcher {
...
@@ -86,7 +86,7 @@ public abstract class Launcher {
* Create a classloader for the specified URLs
* Create a classloader for the specified URLs
* @param urls the URLs
* @param urls the URLs
* @return the classloader
* @return the classloader
* @throws Exception
* @throws Exception
if the classloader cannot be created
*/
*/
protected
ClassLoader
createClassLoader
(
URL
[]
urls
)
throws
Exception
{
protected
ClassLoader
createClassLoader
(
URL
[]
urls
)
throws
Exception
{
return
new
LaunchedURLClassLoader
(
urls
,
getClass
().
getClassLoader
());
return
new
LaunchedURLClassLoader
(
urls
,
getClass
().
getClassLoader
());
...
@@ -97,7 +97,7 @@ public abstract class Launcher {
...
@@ -97,7 +97,7 @@ public abstract class Launcher {
* @param args the incoming arguments
* @param args the incoming arguments
* @param mainClass the main class to run
* @param mainClass the main class to run
* @param classLoader the classloader
* @param classLoader the classloader
* @throws Exception
* @throws Exception
if the launch fails
*/
*/
protected
void
launch
(
String
[]
args
,
String
mainClass
,
ClassLoader
classLoader
)
protected
void
launch
(
String
[]
args
,
String
mainClass
,
ClassLoader
classLoader
)
throws
Exception
{
throws
Exception
{
...
@@ -114,7 +114,7 @@ public abstract class Launcher {
...
@@ -114,7 +114,7 @@ public abstract class Launcher {
* @param args the incoming arguments
* @param args the incoming arguments
* @param classLoader the classloader
* @param classLoader the classloader
* @return a runnable used to start the application
* @return a runnable used to start the application
* @throws Exception
* @throws Exception
if the main method runner cannot be created
*/
*/
protected
Runnable
createMainMethodRunner
(
String
mainClass
,
String
[]
args
,
protected
Runnable
createMainMethodRunner
(
String
mainClass
,
String
[]
args
,
ClassLoader
classLoader
)
throws
Exception
{
ClassLoader
classLoader
)
throws
Exception
{
...
@@ -127,14 +127,14 @@ public abstract class Launcher {
...
@@ -127,14 +127,14 @@ public abstract class Launcher {
/**
/**
* Returns the main class that should be launched.
* Returns the main class that should be launched.
* @return the name of the main class
* @return the name of the main class
* @throws Exception
* @throws Exception
if the main class cannot be obtained
*/
*/
protected
abstract
String
getMainClass
()
throws
Exception
;
protected
abstract
String
getMainClass
()
throws
Exception
;
/**
/**
* Returns the archives that will be used to construct the class path.
* Returns the archives that will be used to construct the class path.
* @return the class path archives
* @return the class path archives
* @throws Exception
* @throws Exception
if the class path archives cannot be obtained
*/
*/
protected
abstract
List
<
Archive
>
getClassPathArchives
()
throws
Exception
;
protected
abstract
List
<
Archive
>
getClassPathArchives
()
throws
Exception
;
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
View file @
f65dfe4b
...
@@ -37,7 +37,7 @@ public abstract class Archive {
...
@@ -37,7 +37,7 @@ public abstract class Archive {
/**
/**
* Returns a URL that can be used to load the archive.
* Returns a URL that can be used to load the archive.
* @return the archive URL
* @return the archive URL
* @throws MalformedURLException
* @throws MalformedURLException
if the URL is malformed
*/
*/
public
abstract
URL
getUrl
()
throws
MalformedURLException
;
public
abstract
URL
getUrl
()
throws
MalformedURLException
;
...
@@ -45,7 +45,7 @@ public abstract class Archive {
...
@@ -45,7 +45,7 @@ public abstract class Archive {
* Obtain the main class that should be used to launch the application. By default
* Obtain the main class that should be used to launch the application. By default
* this method uses a {@code Start-Class} manifest entry.
* this method uses a {@code Start-Class} manifest entry.
* @return the main class
* @return the main class
* @throws Exception
* @throws Exception
if the main class cannot be obtained
*/
*/
public
String
getMainClass
()
throws
Exception
{
public
String
getMainClass
()
throws
Exception
{
Manifest
manifest
=
getManifest
();
Manifest
manifest
=
getManifest
();
...
@@ -73,7 +73,7 @@ public abstract class Archive {
...
@@ -73,7 +73,7 @@ public abstract class Archive {
/**
/**
* Returns the manifest of the archive.
* Returns the manifest of the archive.
* @return the manifest
* @return the manifest
* @throws IOException
* @throws IOException
if the manifest cannot be read
*/
*/
public
abstract
Manifest
getManifest
()
throws
IOException
;
public
abstract
Manifest
getManifest
()
throws
IOException
;
...
@@ -87,7 +87,7 @@ public abstract class Archive {
...
@@ -87,7 +87,7 @@ public abstract class Archive {
* Returns nested {@link Archive}s for entries that match the specified filter.
* Returns nested {@link Archive}s for entries that match the specified filter.
* @param filter the filter used to limit entries
* @param filter the filter used to limit entries
* @return nested archives
* @return nested archives
* @throws IOException
* @throws IOException
if nested archives cannot be read
*/
*/
public
abstract
List
<
Archive
>
getNestedArchives
(
EntryFilter
filter
)
public
abstract
List
<
Archive
>
getNestedArchives
(
EntryFilter
filter
)
throws
IOException
;
throws
IOException
;
...
@@ -96,7 +96,7 @@ public abstract class Archive {
...
@@ -96,7 +96,7 @@ public abstract class Archive {
* Returns a filtered version of the archive.
* Returns a filtered version of the archive.
* @param filter the filter to apply
* @param filter the filter to apply
* @return a filter archive
* @return a filter archive
* @throws IOException
* @throws IOException
if the archive cannot be read
*/
*/
public
abstract
Archive
getFilteredArchive
(
EntryRenameFilter
filter
)
public
abstract
Archive
getFilteredArchive
(
EntryRenameFilter
filter
)
throws
IOException
;
throws
IOException
;
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
View file @
f65dfe4b
...
@@ -32,7 +32,7 @@ public interface RandomAccessData {
...
@@ -32,7 +32,7 @@ public interface RandomAccessData {
* caller is responsible close the underlying stream.
* caller is responsible close the underlying stream.
* @param access hint indicating how the underlying data should be accessed
* @param access hint indicating how the underlying data should be accessed
* @return a new input stream that can be used to read the underlying data.
* @return a new input stream that can be used to read the underlying data.
* @throws IOException
* @throws IOException
if the stream cannot be opened
*/
*/
InputStream
getInputStream
(
ResourceAccess
access
)
throws
IOException
;
InputStream
getInputStream
(
ResourceAccess
access
)
throws
IOException
;
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java
View file @
f65dfe4b
...
@@ -100,7 +100,7 @@ public final class JarEntryData {
...
@@ -100,7 +100,7 @@ public final class JarEntryData {
* @return the underlying {@link RandomAccessData} for this entry. Generally this
* @return the underlying {@link RandomAccessData} for this entry. Generally this
* method should not be called directly and instead data should be accessed via
* method should not be called directly and instead data should be accessed via
* {@link JarFile#getInputStream(ZipEntry)}.
* {@link JarFile#getInputStream(ZipEntry)}.
* @throws IOException
* @throws IOException
if the data cannot be read
*/
*/
public
RandomAccessData
getData
()
throws
IOException
{
public
RandomAccessData
getData
()
throws
IOException
{
if
(
this
.
data
==
null
)
{
if
(
this
.
data
==
null
)
{
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
View file @
f65dfe4b
...
@@ -89,7 +89,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -89,7 +89,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
/**
/**
* Create a new {@link JarFile} backed by the specified file.
* Create a new {@link JarFile} backed by the specified file.
* @param file the root jar file
* @param file the root jar file
* @throws IOException
* @throws IOException
if the file cannot be read
*/
*/
public
JarFile
(
File
file
)
throws
IOException
{
public
JarFile
(
File
file
)
throws
IOException
{
this
(
new
RandomAccessDataFile
(
file
));
this
(
new
RandomAccessDataFile
(
file
));
...
@@ -98,7 +98,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -98,7 +98,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
/**
/**
* Create a new {@link JarFile} backed by the specified file.
* Create a new {@link JarFile} backed by the specified file.
* @param file the root jar file
* @param file the root jar file
* @throws IOException
* @throws IOException
if the file cannot be read
*/
*/
JarFile
(
RandomAccessDataFile
file
)
throws
IOException
{
JarFile
(
RandomAccessDataFile
file
)
throws
IOException
{
this
(
file
,
""
,
file
);
this
(
file
,
""
,
file
);
...
@@ -110,7 +110,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -110,7 +110,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
* @param rootFile the root jar file
* @param rootFile the root jar file
* @param pathFromRoot the name of this file
* @param pathFromRoot the name of this file
* @param data the underlying data
* @param data the underlying data
* @throws IOException
* @throws IOException
if the file cannot be read
*/
*/
private
JarFile
(
RandomAccessDataFile
rootFile
,
String
pathFromRoot
,
private
JarFile
(
RandomAccessDataFile
rootFile
,
String
pathFromRoot
,
RandomAccessData
data
)
throws
IOException
{
RandomAccessData
data
)
throws
IOException
{
...
@@ -320,19 +320,19 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -320,19 +320,19 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
/**
/**
* Return a nested {@link JarFile} loaded from the specified entry.
* Return a nested {@link JarFile} loaded from the specified entry.
* @param
ze
the zip entry
* @param
entry
the zip entry
* @return a {@link JarFile} for the entry
* @return a {@link JarFile} for the entry
* @throws IOException
* @throws IOException
if the nested jar file cannot be read
*/
*/
public
synchronized
JarFile
getNestedJarFile
(
final
ZipEntry
ze
)
throws
IOException
{
public
synchronized
JarFile
getNestedJarFile
(
final
ZipEntry
entry
)
throws
IOException
{
return
getNestedJarFile
(
getContainedEntry
(
ze
).
getSource
());
return
getNestedJarFile
(
getContainedEntry
(
entry
).
getSource
());
}
}
/**
/**
* Return a nested {@link JarFile} loaded from the specified entry.
* Return a nested {@link JarFile} loaded from the specified entry.
* @param sourceEntry the zip entry
* @param sourceEntry the zip entry
* @return a {@link JarFile} for the entry
* @return a {@link JarFile} for the entry
* @throws IOException
* @throws IOException
if the nested jar file cannot be read
*/
*/
public
synchronized
JarFile
getNestedJarFile
(
JarEntryData
sourceEntry
)
public
synchronized
JarFile
getNestedJarFile
(
JarEntryData
sourceEntry
)
throws
IOException
{
throws
IOException
{
...
@@ -388,7 +388,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -388,7 +388,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
* Return a new jar based on the filtered contents of this file.
* Return a new jar based on the filtered contents of this file.
* @param filters the set of jar entry filters to be applied
* @param filters the set of jar entry filters to be applied
* @return a filtered {@link JarFile}
* @return a filtered {@link JarFile}
* @throws IOException
* @throws IOException
if the jar file cannot be read
*/
*/
public
synchronized
JarFile
getFilteredJarFile
(
JarEntryFilter
...
filters
)
public
synchronized
JarFile
getFilteredJarFile
(
JarEntryFilter
...
filters
)
throws
IOException
{
throws
IOException
{
...
@@ -418,7 +418,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -418,7 +418,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
* Return a URL that can be used to access this JAR file. NOTE: the specified URL
* Return a URL that can be used to access this JAR file. NOTE: the specified URL
* cannot be serialized and or cloned.
* cannot be serialized and or cloned.
* @return the URL
* @return the URL
* @throws MalformedURLException
* @throws MalformedURLException
if the URL is malformed
*/
*/
public
URL
getUrl
()
throws
MalformedURLException
{
public
URL
getUrl
()
throws
MalformedURLException
{
if
(
this
.
url
==
null
)
{
if
(
this
.
url
==
null
)
{
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/AsciiBytes.java
View file @
f65dfe4b
...
@@ -42,7 +42,7 @@ public final class AsciiBytes {
...
@@ -42,7 +42,7 @@ public final class AsciiBytes {
/**
/**
* Create a new {@link AsciiBytes} from the specified String.
* Create a new {@link AsciiBytes} from the specified String.
* @param string
* @param string
the source string
*/
*/
public
AsciiBytes
(
String
string
)
{
public
AsciiBytes
(
String
string
)
{
this
(
string
.
getBytes
(
UTF_8
));
this
(
string
.
getBytes
(
UTF_8
));
...
@@ -52,7 +52,7 @@ public final class AsciiBytes {
...
@@ -52,7 +52,7 @@ public final class AsciiBytes {
/**
/**
* Create a new {@link AsciiBytes} from the specified bytes. NOTE: underlying bytes
* Create a new {@link AsciiBytes} from the specified bytes. NOTE: underlying bytes
* are not expected to change.
* are not expected to change.
* @param bytes the bytes
* @param bytes the
source
bytes
*/
*/
public
AsciiBytes
(
byte
[]
bytes
)
{
public
AsciiBytes
(
byte
[]
bytes
)
{
this
(
bytes
,
0
,
bytes
.
length
);
this
(
bytes
,
0
,
bytes
.
length
);
...
@@ -61,7 +61,7 @@ public final class AsciiBytes {
...
@@ -61,7 +61,7 @@ public final class AsciiBytes {
/**
/**
* Create a new {@link AsciiBytes} from the specified bytes. NOTE: underlying bytes
* Create a new {@link AsciiBytes} from the specified bytes. NOTE: underlying bytes
* are not expected to change.
* are not expected to change.
* @param bytes the bytes
* @param bytes the
source
bytes
* @param offset the offset
* @param offset the offset
* @param length the length
* @param length the length
*/
*/
...
...
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @
f65dfe4b
...
@@ -119,7 +119,6 @@ import org.springframework.web.context.support.StandardServletEnvironment;
...
@@ -119,7 +119,6 @@ import org.springframework.web.context.support.StandardServletEnvironment;
* generally recommended that a single {@code @Configuration} class is used to bootstrap
* generally recommended that a single {@code @Configuration} class is used to bootstrap
* your application, however, any of the following sources can also be used:
* your application, however, any of the following sources can also be used:
*
*
* <p>
* <ul>
* <ul>
* <li>{@link Class} - A Java class to be loaded by {@link AnnotatedBeanDefinitionReader}</li>
* <li>{@link Class} - A Java class to be loaded by {@link AnnotatedBeanDefinitionReader}</li>
*
*
...
...
spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View file @
f65dfe4b
...
@@ -405,7 +405,7 @@ public class SpringApplicationBuilder {
...
@@ -405,7 +405,7 @@ public class SpringApplicationBuilder {
/**
/**
* Default properties for the environment. Multiple calls to this method are
* Default properties for the environment. Multiple calls to this method are
* cumulative.
* cumulative.
* @param defaults
* @param defaults
the default properties
* @return the current builder
* @return the current builder
* @see SpringApplicationBuilder#properties(String...)
* @see SpringApplicationBuilder#properties(String...)
*/
*/
...
...
spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java
View file @
f65dfe4b
...
@@ -68,7 +68,8 @@ public class ContextIdApplicationContextInitializer implements
...
@@ -68,7 +68,8 @@ public class ContextIdApplicationContextInitializer implements
}
}
/**
/**
* @param name
* Create a new {@link ContextIdApplicationContextInitializer} instance.
* @param name the name of the application (can include placeholders)
*/
*/
public
ContextIdApplicationContextInitializer
(
String
name
)
{
public
ContextIdApplicationContextInitializer
(
String
name
)
{
this
.
name
=
name
;
this
.
name
=
name
;
...
@@ -91,7 +92,6 @@ public class ContextIdApplicationContextInitializer implements
...
@@ -91,7 +92,6 @@ public class ContextIdApplicationContextInitializer implements
private
String
getApplicationId
(
ConfigurableEnvironment
environment
)
{
private
String
getApplicationId
(
ConfigurableEnvironment
environment
)
{
String
name
=
environment
.
resolvePlaceholders
(
this
.
name
);
String
name
=
environment
.
resolvePlaceholders
(
this
.
name
);
String
index
=
environment
.
resolvePlaceholders
(
INDEX_PATTERN
);
String
index
=
environment
.
resolvePlaceholders
(
INDEX_PATTERN
);
String
profiles
=
StringUtils
.
arrayToCommaDelimitedString
(
environment
String
profiles
=
StringUtils
.
arrayToCommaDelimitedString
(
environment
.
getActiveProfiles
());
.
getActiveProfiles
());
if
(
StringUtils
.
hasText
(
profiles
))
{
if
(
StringUtils
.
hasText
(
profiles
))
{
...
...
spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
View file @
f65dfe4b
...
@@ -114,28 +114,32 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
...
@@ -114,28 +114,32 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
}
}
/**
/**
* @param propertySources
* Set the property sources to bind.
* @param propertySources the property sources
*/
*/
public
void
setPropertySources
(
PropertySources
propertySources
)
{
public
void
setPropertySources
(
PropertySources
propertySources
)
{
this
.
propertySources
=
propertySources
;
this
.
propertySources
=
propertySources
;
}
}
/**
/**
* @param validator the validator to set
* Set the bean validator used to validate property fields.
* @param validator the validator
*/
*/
public
void
setValidator
(
Validator
validator
)
{
public
void
setValidator
(
Validator
validator
)
{
this
.
validator
=
validator
;
this
.
validator
=
validator
;
}
}
/**
/**
* @param conversionService the conversionService to set
* Set the conversion service used to convert property values.
* @param conversionService the conversion service
*/
*/
public
void
setConversionService
(
ConversionService
conversionService
)
{
public
void
setConversionService
(
ConversionService
conversionService
)
{
this
.
conversionService
=
conversionService
;
this
.
conversionService
=
conversionService
;
}
}
/**
/**
* @param beans the bean meta data to set
* Set the bean meta-data store.
* @param beans the bean meta data store
*/
*/
public
void
setBeanMetaDataStore
(
ConfigurationBeanFactoryMetaData
beans
)
{
public
void
setBeanMetaDataStore
(
ConfigurationBeanFactoryMetaData
beans
)
{
this
.
beans
=
beans
;
this
.
beans
=
beans
;
...
@@ -163,11 +167,9 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
...
@@ -163,11 +167,9 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
@Override
@Override
public
void
afterPropertiesSet
()
throws
Exception
{
public
void
afterPropertiesSet
()
throws
Exception
{
if
(
this
.
propertySources
==
null
)
{
if
(
this
.
propertySources
==
null
)
{
this
.
propertySources
=
deducePropertySources
();
this
.
propertySources
=
deducePropertySources
();
}
}
if
(
this
.
validator
==
null
)
{
if
(
this
.
validator
==
null
)
{
this
.
validator
=
getOptionalBean
(
VALIDATOR_BEAN_NAME
,
Validator
.
class
);
this
.
validator
=
getOptionalBean
(
VALIDATOR_BEAN_NAME
,
Validator
.
class
);
if
(
this
.
validator
==
null
&&
isJsr303Present
())
{
if
(
this
.
validator
==
null
&&
isJsr303Present
())
{
...
@@ -176,7 +178,6 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
...
@@ -176,7 +178,6 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
this
.
ownedValidator
=
true
;
this
.
ownedValidator
=
true
;
}
}
}
}
if
(
this
.
conversionService
==
null
)
{
if
(
this
.
conversionService
==
null
)
{
this
.
conversionService
=
getOptionalBean
(
this
.
conversionService
=
getOptionalBean
(
ConfigurableApplicationContext
.
CONVERSION_SERVICE_BEAN_NAME
,
ConfigurableApplicationContext
.
CONVERSION_SERVICE_BEAN_NAME
,
...
...
spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
View file @
f65dfe4b
...
@@ -42,6 +42,7 @@ public @interface EnableConfigurationProperties {
...
@@ -42,6 +42,7 @@ public @interface EnableConfigurationProperties {
/**
/**
* Convenient way to quickly register {@link ConfigurationProperties} beans with
* Convenient way to quickly register {@link ConfigurationProperties} beans with
* Spring. Standard Spring Beans will also be scanned regardless of this value.
* Spring. Standard Spring Beans will also be scanned regardless of this value.
* @return {@link ConfigurationProperties} beans to register
*/
*/
Class
<?>[]
value
()
default
{};
Class
<?>[]
value
()
default
{};
...
...
spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java
View file @
f65dfe4b
...
@@ -45,7 +45,7 @@ public interface PropertySourceLoader {
...
@@ -45,7 +45,7 @@ public interface PropertySourceLoader {
* used to load multi-document files (such as YAML). Simple property formats should
* used to load multi-document files (such as YAML). Simple property formats should
* {@code null} when asked to load a profile.
* {@code null} when asked to load a profile.
* @return a property source or {@code null}
* @return a property source or {@code null}
* @throws IOException
* @throws IOException
if the source cannot be loaded
*/
*/
PropertySource
<?>
load
(
String
name
,
Resource
resource
,
String
profile
)
PropertySource
<?>
load
(
String
name
,
Resource
resource
,
String
profile
)
throws
IOException
;
throws
IOException
;
...
...
spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
View file @
f65dfe4b
...
@@ -69,7 +69,7 @@ public class PropertySourcesLoader {
...
@@ -69,7 +69,7 @@ public class PropertySourcesLoader {
* Load the specified resource (if possible) and add it as the first source.
* Load the specified resource (if possible) and add it as the first source.
* @param resource the source resource (may be {@code null}).
* @param resource the source resource (may be {@code null}).
* @return the loaded property source or {@code null}
* @return the loaded property source or {@code null}
* @throws IOException
* @throws IOException
if the source cannot be loaded
*/
*/
public
PropertySource
<?>
load
(
Resource
resource
)
throws
IOException
{
public
PropertySource
<?>
load
(
Resource
resource
)
throws
IOException
{
return
load
(
resource
,
null
);
return
load
(
resource
,
null
);
...
@@ -81,7 +81,7 @@ public class PropertySourcesLoader {
...
@@ -81,7 +81,7 @@ public class PropertySourcesLoader {
* @param resource the source resource (may be {@code null}).
* @param resource the source resource (may be {@code null}).
* @param profile a specific profile to load or {@code null} to load the default.
* @param profile a specific profile to load or {@code null} to load the default.
* @return the loaded property source or {@code null}
* @return the loaded property source or {@code null}
* @throws IOException
* @throws IOException
if the source cannot be loaded
*/
*/
public
PropertySource
<?>
load
(
Resource
resource
,
String
profile
)
throws
IOException
{
public
PropertySource
<?>
load
(
Resource
resource
,
String
profile
)
throws
IOException
{
return
load
(
resource
,
resource
.
getDescription
(),
profile
);
return
load
(
resource
,
resource
.
getDescription
(),
profile
);
...
@@ -94,7 +94,7 @@ public class PropertySourcesLoader {
...
@@ -94,7 +94,7 @@ public class PropertySourcesLoader {
* @param name the root property name (may be {@code null}).
* @param name the root property name (may be {@code null}).
* @param profile a specific profile to load or {@code null} to load the default.
* @param profile a specific profile to load or {@code null} to load the default.
* @return the loaded property source or {@code null}
* @return the loaded property source or {@code null}
* @throws IOException
* @throws IOException
if the source cannot be loaded
*/
*/
public
PropertySource
<?>
load
(
Resource
resource
,
String
name
,
String
profile
)
public
PropertySource
<?>
load
(
Resource
resource
,
String
name
,
String
profile
)
throws
IOException
{
throws
IOException
{
...
@@ -115,7 +115,7 @@ public class PropertySourcesLoader {
...
@@ -115,7 +115,7 @@ public class PropertySourcesLoader {
* @param name the root property name (may be {@code null}).
* @param name the root property name (may be {@code null}).
* @param profile a specific profile to load or {@code null} to load the default.
* @param profile a specific profile to load or {@code null} to load the default.
* @return the loaded property source or {@code null}
* @return the loaded property source or {@code null}
* @throws IOException
* @throws IOException
if the source cannot be loaded
*/
*/
public
PropertySource
<?>
load
(
Resource
resource
,
String
group
,
String
name
,
public
PropertySource
<?>
load
(
Resource
resource
,
String
group
,
String
name
,
String
profile
)
throws
IOException
{
String
profile
)
throws
IOException
{
...
...
spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
View file @
f65dfe4b
...
@@ -118,7 +118,7 @@ public class AtomikosProperties {
...
@@ -118,7 +118,7 @@ public class AtomikosProperties {
/**
/**
* Specifies whether VM shutdown should trigger forced shutdown of the transaction
* Specifies whether VM shutdown should trigger forced shutdown of the transaction
* core. Defaults to false.
* core. Defaults to false.
* @param forceShutdownOnVmExit
* @param forceShutdownOnVmExit
if VM shutdown should be forced
*/
*/
public
void
setForceShutdownOnVmExit
(
boolean
forceShutdownOnVmExit
)
{
public
void
setForceShutdownOnVmExit
(
boolean
forceShutdownOnVmExit
)
{
set
(
"force_shutdown_on_vm_exit"
,
forceShutdownOnVmExit
);
set
(
"force_shutdown_on_vm_exit"
,
forceShutdownOnVmExit
);
...
...
spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityScan.java
View file @
f65dfe4b
...
@@ -53,16 +53,17 @@ public @interface EntityScan {
...
@@ -53,16 +53,17 @@ public @interface EntityScan {
* Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
* Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
* declarations e.g.: {@code @EntityScan("org.my.pkg")} instead of
* declarations e.g.: {@code @EntityScan("org.my.pkg")} instead of
* {@code @EntityScan(basePackages="org.my.pkg")}.
* {@code @EntityScan(basePackages="org.my.pkg")}.
* @return the base packages to scan
*/
*/
String
[]
value
()
default
{};
String
[]
value
()
default
{};
/**
/**
* Base packages to scan for annotated entities.
* Base packages to scan for annotated entities. {@link #value()} is an alias for (and
* <p>
* mutually exclusive with) this attribute.
* {@link #value()} is an alias for (and mutually exclusive with) this attribute.
* <p>
* <p>
* Use {@link #basePackageClasses()} for a type-safe alternative to String-based
* Use {@link #basePackageClasses()} for a type-safe alternative to String-based
* package names.
* package names.
* @return the base packages to scan
*/
*/
String
[]
basePackages
()
default
{};
String
[]
basePackages
()
default
{};
...
@@ -72,6 +73,7 @@ public @interface EntityScan {
...
@@ -72,6 +73,7 @@ public @interface EntityScan {
* <p>
* <p>
* Consider creating a special no-op marker class or interface in each package that
* Consider creating a special no-op marker class or interface in each package that
* serves no purpose other than being referenced by this attribute.
* serves no purpose other than being referenced by this attribute.
* @return classes form the base packages to scan
*/
*/
Class
<?>[]
basePackageClasses
()
default
{};
Class
<?>[]
basePackageClasses
()
default
{};
...
...
spring-boot/src/main/java/org/springframework/boot/test/IntegrationTest.java
View file @
f65dfe4b
...
@@ -56,6 +56,7 @@ public @interface IntegrationTest {
...
@@ -56,6 +56,7 @@ public @interface IntegrationTest {
/**
/**
* Properties in form {@literal key=value} that should be added to the Spring
* Properties in form {@literal key=value} that should be added to the Spring
* {@link Environment} before the test runs.
* {@link Environment} before the test runs.
* @return the environment properties
*/
*/
String
[]
value
()
default
{};
String
[]
value
()
default
{};
...
...
spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java
View file @
f65dfe4b
...
@@ -45,31 +45,37 @@ public @interface SpringApplicationConfiguration {
...
@@ -45,31 +45,37 @@ public @interface SpringApplicationConfiguration {
/**
/**
* @see ContextConfiguration#locations()
* @see ContextConfiguration#locations()
* @return the context configuration locations
*/
*/
String
[]
locations
()
default
{};
String
[]
locations
()
default
{};
/**
/**
* @see ContextConfiguration#classes()
* @see ContextConfiguration#classes()
* @return the context configuration classes
*/
*/
Class
<?>[]
classes
()
default
{};
Class
<?>[]
classes
()
default
{};
/**
/**
* @see ContextConfiguration#initializers()
* @see ContextConfiguration#initializers()
* @return the context configuration initializers
*/
*/
Class
<?
extends
ApplicationContextInitializer
<?
extends
ConfigurableApplicationContext
>>[]
initializers
()
default
{};
Class
<?
extends
ApplicationContextInitializer
<?
extends
ConfigurableApplicationContext
>>[]
initializers
()
default
{};
/**
/**
* @see ContextConfiguration#inheritLocations()
* @see ContextConfiguration#inheritLocations()
* @return if context locations should be inherited
*/
*/
boolean
inheritLocations
()
default
true
;
boolean
inheritLocations
()
default
true
;
/**
/**
* @see ContextConfiguration#inheritInitializers()
* @see ContextConfiguration#inheritInitializers()
* @return if context initializers should be inherited
*/
*/
boolean
inheritInitializers
()
default
true
;
boolean
inheritInitializers
()
default
true
;
/**
/**
* @see ContextConfiguration#name()
* @see ContextConfiguration#name()
* @return if context configuration name
*/
*/
String
name
()
default
""
;
String
name
()
default
""
;
...
...
spring-boot/src/main/java/org/springframework/boot/test/WebIntegrationTest.java
View file @
f65dfe4b
...
@@ -49,6 +49,7 @@ public @interface WebIntegrationTest {
...
@@ -49,6 +49,7 @@ public @interface WebIntegrationTest {
/**
/**
* Properties in form {@literal key=value} that should be added to the Spring
* Properties in form {@literal key=value} that should be added to the Spring
* {@link Environment} before the test runs.
* {@link Environment} before the test runs.
* @return properties to add to the context
*/
*/
String
[]
value
()
default
{};
String
[]
value
()
default
{};
...
@@ -57,6 +58,7 @@ public @interface WebIntegrationTest {
...
@@ -57,6 +58,7 @@ public @interface WebIntegrationTest {
* {@link Environment} property which usually triggers listening on a random port.
* {@link Environment} property which usually triggers listening on a random port.
* Often used in conjunction with a <code>@Value("${local.server.port}")</code>
* Often used in conjunction with a <code>@Value("${local.server.port}")</code>
* injected field on the test.
* injected field on the test.
* @return if a random port should be used
*/
*/
boolean
randomPort
()
default
false
;
boolean
randomPort
()
default
false
;
...
...
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