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
36ed0f5c
Commit
36ed0f5c
authored
Nov 18, 2015
by
Johnny Lim
Committed by
Stephane Nicoll
Nov 19, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-4537
parent
6146817b
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
33 additions
and
33 deletions
+33
-33
AutoConfigurationSorter.java
...framework/boot/autoconfigure/AutoConfigurationSorter.java
+7
-7
JobLauncherCommandLineRunner.java
...oot/autoconfigure/batch/JobLauncherCommandLineRunner.java
+1
-1
FlywayMigrationInitializer.java
...boot/autoconfigure/flyway/FlywayMigrationInitializer.java
+1
-1
GroovyTemplateAutoConfiguration.java
...gure/groovy/template/GroovyTemplateAutoConfiguration.java
+1
-1
DatabaseDriver.java
...ringframework/boot/autoconfigure/jdbc/DatabaseDriver.java
+2
-2
EmbeddedDatabaseConnection.java
...k/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java
+1
-1
DataSourcePoolMetadata.java
...t/autoconfigure/jdbc/metadata/DataSourcePoolMetadata.java
+1
-1
DataSourcePoolMetadataProviders.java
...figure/jdbc/metadata/DataSourcePoolMetadataProviders.java
+1
-1
ArtemisEmbeddedConfigurationFactory.java
...gure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
+1
-1
HornetQEmbeddedConfigurationFactory.java
...gure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java
+1
-1
HibernateJpaAutoConfiguration.java
.../autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
+1
-1
package-info.java
...ramework/boot/autoconfigure/transaction/package-info.java
+1
-1
WebSocketContainerCustomizer.java
...autoconfigure/websocket/WebSocketContainerCustomizer.java
+1
-1
PersistenceExceptionTranslationAutoConfigurationTests.java
...ersistenceExceptionTranslationAutoConfigurationTests.java
+3
-3
ArtemisAutoConfigurationTests.java
...oconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
+1
-1
ArtemisEmbeddedConfigurationFactoryTests.java
...jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java
+1
-1
HornetQAutoConfigurationTests.java
...oconfigure/jms/hornetq/HornetQAutoConfigurationTests.java
+1
-1
HornetQEmbeddedConfigurationFactoryTests.java
...jms/hornetq/HornetQEmbeddedConfigurationFactoryTests.java
+3
-3
MultipartAutoConfigurationTests.java
...ot/autoconfigure/web/MultipartAutoConfigurationTests.java
+3
-3
DependencyFilter.java
...java/org/springframework/boot/maven/DependencyFilter.java
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
View file @
36ed0f5c
...
...
@@ -74,27 +74,27 @@ class AutoConfigurationSorter {
private
List
<
String
>
sortByAnnotation
(
AutoConfigurationClasses
classes
,
List
<
String
>
classNames
)
{
List
<
String
>
to
s
ort
=
new
ArrayList
<
String
>(
classNames
);
List
<
String
>
to
S
ort
=
new
ArrayList
<
String
>(
classNames
);
Set
<
String
>
sorted
=
new
LinkedHashSet
<
String
>();
Set
<
String
>
processing
=
new
LinkedHashSet
<
String
>();
while
(!
to
s
ort
.
isEmpty
())
{
doSortByAfterAnnotation
(
classes
,
to
s
ort
,
sorted
,
processing
,
null
);
while
(!
to
S
ort
.
isEmpty
())
{
doSortByAfterAnnotation
(
classes
,
to
S
ort
,
sorted
,
processing
,
null
);
}
return
new
ArrayList
<
String
>(
sorted
);
}
private
void
doSortByAfterAnnotation
(
AutoConfigurationClasses
classes
,
List
<
String
>
to
s
ort
,
Set
<
String
>
sorted
,
Set
<
String
>
processing
,
List
<
String
>
to
S
ort
,
Set
<
String
>
sorted
,
Set
<
String
>
processing
,
String
current
)
{
if
(
current
==
null
)
{
current
=
to
s
ort
.
remove
(
0
);
current
=
to
S
ort
.
remove
(
0
);
}
processing
.
add
(
current
);
for
(
String
after
:
classes
.
getClassesRequestedAfter
(
current
))
{
Assert
.
state
(!
processing
.
contains
(
after
),
"AutoConfigure cycle detected between "
+
current
+
" and "
+
after
);
if
(!
sorted
.
contains
(
after
)
&&
to
s
ort
.
contains
(
after
))
{
doSortByAfterAnnotation
(
classes
,
to
s
ort
,
sorted
,
processing
,
after
);
if
(!
sorted
.
contains
(
after
)
&&
to
S
ort
.
contains
(
after
))
{
doSortByAfterAnnotation
(
classes
,
to
S
ort
,
sorted
,
processing
,
after
);
}
}
processing
.
remove
(
current
);
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
View file @
36ed0f5c
...
...
@@ -198,7 +198,7 @@ public class JobLauncherCommandLineRunner
}
execute
(
job
,
jobParameters
);
}
catch
(
NoSuchJobException
nsje
)
{
catch
(
NoSuchJobException
ex
)
{
logger
.
debug
(
"No job found in registry for job name: "
+
jobName
);
continue
;
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationInitializer.java
View file @
36ed0f5c
...
...
@@ -48,7 +48,7 @@ public class FlywayMigrationInitializer implements InitializingBean, Ordered {
/**
* Create a new {@link FlywayMigrationInitializer} instance.
* @param flyway the flyway instance
* @param migrationStrategy the migration stra
get
y or {@code null}
* @param migrationStrategy the migration stra
teg
y or {@code null}
*/
public
FlywayMigrationInitializer
(
Flyway
flyway
,
FlywayMigrationStrategy
migrationStrategy
)
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java
View file @
36ed0f5c
...
...
@@ -46,7 +46,7 @@ import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
import
org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver
;
/**
* Autoconfiguration support for Groovy templates in MVC. By default creates a
* Auto
-
configuration support for Groovy templates in MVC. By default creates a
* {@link MarkupTemplateEngine} configured from {@link GroovyTemplateProperties}, but you
* can override that by providing your own {@link GroovyMarkupConfig} or even a
* {@link MarkupTemplateEngine} of a different type.
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
View file @
36ed0f5c
...
...
@@ -75,12 +75,12 @@ enum DatabaseDriver {
ORACLE
(
"oracle.jdbc.OracleDriver"
,
"oracle.jdbc.xa.client.OracleXADataSource"
),
/**
* Postres.
* Post
g
res.
*/
POSTGRESQL
(
"org.postgresql.Driver"
,
"org.postgresql.xa.PGXADataSource"
),
/**
*
J
TDS.
*
j
TDS.
*/
JTDS
(
"net.sourceforge.jtds.jdbc.Driver"
),
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java
View file @
36ed0f5c
...
...
@@ -118,7 +118,7 @@ public enum EmbeddedDatabaseConnection {
* database type.
*
* @param dataSource the data source to interrogate
* @return true if the data sourceis one of the embedded types
* @return true if the data source
is one of the embedded types
*/
public
static
boolean
isEmbedded
(
DataSource
dataSource
)
{
try
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadata.java
View file @
36ed0f5c
...
...
@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.jdbc.metadata;
import
javax.sql.DataSource
;
/**
* Provides access meta-data that is commonly available from most po
l
led
* Provides access meta-data that is commonly available from most po
o
led
* {@link DataSource} implementations.
*
* @author Stephane Nicoll
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java
View file @
36ed0f5c
...
...
@@ -37,7 +37,7 @@ public class DataSourcePoolMetadataProviders implements DataSourcePoolMetadataPr
/**
* Create a {@link DataSourcePoolMetadataProviders} instance with an initial
* collection of delegates to use.
* @param providers the data source pool metdata providers
* @param providers the data source pool met
a
data providers
*/
public
DataSourcePoolMetadataProviders
(
Collection
<?
extends
DataSourcePoolMetadataProvider
>
providers
)
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
View file @
36ed0f5c
...
...
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory;
* Configuration used to create the embedded Artemis server.
*
* @author Eddú Meléndez
* @author Stephane Nicol
* @author Stephane Nicol
l
* @author Phillip Webb
*/
class
ArtemisEmbeddedConfigurationFactory
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java
View file @
36ed0f5c
...
...
@@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.jms.hornetq.HornetQProperties.Embe
/**
* Factory class to create a HornetQ {@link Configuration} from {@link HornetQProperties}.
*
* @author Stephane Nicol
* @author Stephane Nicol
l
* @author Phillip Webb
* @since 1.1.0
*/
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
View file @
36ed0f5c
...
...
@@ -114,7 +114,7 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration {
if
(
jtaTransactionManager
!=
null
)
{
if
(
runningOnWebSphere
())
{
// We can never use SpringJtaPlatform on WebSphere as
// WebSphereUowTransactionManger has a null TransactionManager
// WebSphereUowTransactionMan
a
ger has a null TransactionManager
// which will cause Hibernate to NPE
configureWebSphereTransactionPlatform
(
vendorProperties
);
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/package-info.java
View file @
36ed0f5c
...
...
@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for transaction suport.
* Auto-configuration for transaction sup
p
ort.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
transaction
;
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketContainerCustomizer.java
View file @
36ed0f5c
...
...
@@ -30,7 +30,7 @@ import org.springframework.core.ResolvableType;
* {@link EmbeddedServletContainerCustomizer} to configure websockets for a given
* {@link EmbeddedServletContainerFactory}.
*
* @param <T> the embded servlet container factory
* @param <T> the emb
ed
ded servlet container factory
* @author Dave Syer
* @author Phillip Webb
* @author Andy Wilkinson
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java
View file @
36ed0f5c
...
...
@@ -107,14 +107,14 @@ public class PersistenceExceptionTranslationAutoConfigurationTests {
@Repository
private
static
class
TestRepository
{
private
final
EntityManager
entityManger
;
private
final
EntityManager
entityMan
a
ger
;
TestRepository
(
EntityManager
entityManager
)
{
this
.
entityManger
=
entityManager
;
this
.
entityMan
a
ger
=
entityManager
;
}
public
void
doSomething
()
{
this
.
entityManger
.
persist
(
null
);
this
.
entityMan
a
ger
.
persist
(
null
);
}
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
View file @
36ed0f5c
...
...
@@ -142,7 +142,7 @@ public class ArtemisAutoConfigurationTests {
}
@Test
public
void
embeddedConnectionFactorEvenIfEmbeddedServiceDisabled
()
{
public
void
embeddedConnectionFactor
y
EvenIfEmbeddedServiceDisabled
()
{
// No mode is specified
load
(
EmptyConfiguration
.
class
,
"spring.artemis.mode:embedded"
,
"spring.artemis.embedded.enabled:false"
);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java
View file @
36ed0f5c
...
...
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
* Tests for {@link ArtemisEmbeddedConfigurationFactory}
*
* @author Eddú Meléndez
* @author Stephane Nicol
* @author Stephane Nicol
l
* @author Phillip Webb
*/
public
class
ArtemisEmbeddedConfigurationFactoryTests
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQAutoConfigurationTests.java
View file @
36ed0f5c
...
...
@@ -146,7 +146,7 @@ public class HornetQAutoConfigurationTests {
}
@Test
public
void
embeddedConnectionFactorEvenIfEmbeddedServiceDisabled
()
{
public
void
embeddedConnectionFactor
y
EvenIfEmbeddedServiceDisabled
()
{
// No mode is specified
load
(
EmptyConfiguration
.
class
,
"spring.hornetq.mode:embedded"
,
"spring.hornetq.embedded.enabled:false"
);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactoryTests.java
View file @
36ed0f5c
...
...
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat;
/**
* Tests for {@link HornetQEmbeddedConfigurationFactory}.
*
* @author Stephane Nicol
* @author Stephane Nicol
l
* @author Phillip Webb
*/
public
class
HornetQEmbeddedConfigurationFactoryTests
{
...
...
@@ -55,7 +55,7 @@ public class HornetQEmbeddedConfigurationFactoryTests {
}
@Test
public
void
generatedClusterPass
o
word
()
throws
Exception
{
public
void
generatedClusterPassword
()
throws
Exception
{
HornetQProperties
properties
=
new
HornetQProperties
();
Configuration
configuration
=
new
HornetQEmbeddedConfigurationFactory
(
properties
)
.
createConfiguration
();
...
...
@@ -63,7 +63,7 @@ public class HornetQEmbeddedConfigurationFactoryTests {
}
@Test
public
void
specificClusterPass
o
word
()
throws
Exception
{
public
void
specificClusterPassword
()
throws
Exception
{
HornetQProperties
properties
=
new
HornetQProperties
();
properties
.
getEmbedded
().
setClusterPassword
(
"password"
);
Configuration
configuration
=
new
HornetQEmbeddedConfigurationFactory
(
properties
)
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
View file @
36ed0f5c
...
...
@@ -181,9 +181,9 @@ public class MultipartAutoConfigurationTests {
private
void
testContainerWithCustomMultipartConfigEnabledSetting
(
final
String
propertyValue
,
int
expectedNumberOfMultipartConfigElementBeans
)
{
this
.
context
=
new
AnnotationConfigEmbeddedWebApplicationContext
();
Map
<
String
,
Object
>
poperties
=
new
LinkedHashMap
<
String
,
Object
>();
poperties
.
put
(
"multipart.enabled"
,
propertyValue
);
MapPropertySource
propertySource
=
new
MapPropertySource
(
"test"
,
poperties
);
Map
<
String
,
Object
>
p
r
operties
=
new
LinkedHashMap
<
String
,
Object
>();
p
r
operties
.
put
(
"multipart.enabled"
,
propertyValue
);
MapPropertySource
propertySource
=
new
MapPropertySource
(
"test"
,
p
r
operties
);
this
.
context
.
getEnvironment
().
getPropertySources
().
addFirst
(
propertySource
);
this
.
context
.
register
(
ContainerWithNoMultipartTomcat
.
class
,
BaseConfiguration
.
class
);
...
...
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/DependencyFilter.java
View file @
36ed0f5c
...
...
@@ -28,7 +28,7 @@ import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
/**
* Base class for {@link ArtifactsFilter} based on a {@link FilterableDependency} list.
*
* @author Stephane Nicol
* @author Stephane Nicol
l
* @author David Turanski
* @since 1.2
*/
...
...
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